From 3f763a960f3b5b1a2fb8918ddc53fb7dc19e01af Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Wed, 13 Sep 2023 10:28:13 +0200 Subject: [PATCH] Fix lpstat hanging on IBM AIX Some macros and functions weren't defined on IBM AIX, define them. Update CHANGES.md as well with older fixes. Fixes #773 --- CHANGES.md | 2 ++ cups/request.c | 6 ++++-- scheduler/log.c | 3 +++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 02db7b9b61..9c3d130796 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -10,6 +10,8 @@ Changes in CUPS v2.5b1 (TBA) - Updated `cupsArray` APIs. - Fixed Digest authentication support (Issue #260) - Fixed delays in lpd backend (Issue #741) +- Fixed extensive looping in scheduler (Issue #604) +- Fixed hanging of `lpstat` on IBM AIX (Issue #773) - Fixed segfault in `cupsGetNamedDest()` when trying to get default printer, but the default printer is not set (Issue #719) - Fixed printing multiple files on specific printers (Issue #643) diff --git a/cups/request.c b/cups/request.c index 3c90361af7..d52da153dd 100644 --- a/cups/request.c +++ b/cups/request.c @@ -25,9 +25,11 @@ #ifndef O_BINARY # define O_BINARY 0 #endif /* O_BINARY */ -#ifndef MSG_DONTWAIT +#ifdef _AIX +# define MSG_DONTWAIT MSG_NONBLOCK +#elif !defined(MSG_DONTWAIT) # define MSG_DONTWAIT 0 -#endif /* !MSG_DONTWAIT */ +#endif /* _AIX */ /* diff --git a/scheduler/log.c b/scheduler/log.c index 80e182f535..267ce77a04 100644 --- a/scheduler/log.c +++ b/scheduler/log.c @@ -22,6 +22,9 @@ # include #endif /* HAVE_ASL_H */ #include +#ifndef va_copy +# define va_copy(__list1, __list2) ((void)(__list1 = __list2)) +#endif /* -- 2.47.2