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

diff --git a/CHANGES.md b/CHANGES.md
index 02db7b9b61db15bb5ef1a70ce2d08435dc48d970..9c3d130796e114c535182f72a660174cf965976f 100644 (file)
--- 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 3c90361af71845a68ff72f33ed04406ba40147af..d52da153dd0f7de5589ae7703948f69e693d113c 100644 (file)
--- 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 80e182f535610dbb0ffd8a8ab67fc283e1a04b8f..267ce77a042524929370831e85fa9fab7530cace 100644 (file)
--- a/scheduler/log.c
+++ b/scheduler/log.c
@@ -22,6 +22,9 @@
 #  include <systemd/sd-journal.h>
 #endif /* HAVE_ASL_H */
 #include <syslog.h>
+#ifndef va_copy
+#  define va_copy(__list1, __list2) ((void)(__list1 = __list2))
+#endif
 
 
 /*