Skip to content

Commit 25de524

Browse files
committed
It is just <fcntl.h>, don't use legacy (non-POSIX) path that is still supported
by most Unix platforms, but not all. (this also makes the code consistent with usage everywhere else in the CUPS code base) Fixes: 388
1 parent 52d7f9b commit 25de524

3 files changed

Lines changed: 16 additions & 2 deletions

File tree

CHANGES.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ Changes in CUPS v2.4.2 (TBA)
2828
- Updated the configure script to look for the OpenSSL library the old way if
2929
pkg-config is not available (Issue #375)
3030
- Fixed the prototype for the `httpWriteResponse` function (Issue #380)
31+
- Brought back minimal AIX support (Issue #389)
3132
- `cupsGetResponse` did not always set the last error.
3233
- Fixed a number of old references to the Apple CUPS web page.
3334
- Restored the default/generic printer icon file for the web interface.

configure

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7720,6 +7720,20 @@ fi
77207720
DSOXX="\$(CXX)"
77217721
DSOFLAGS="$DSOFLAGS -Wl,-no_warn_inits -dynamiclib -single_module -lc"
77227722
;; #(
7723+
aix*) :
7724+
7725+
LIBCUPS="lib$cupsbase.so.2"
7726+
if test "x$cupsimagebase" != x
7727+
then :
7728+
7729+
LIBCUPSIMAGE="lib$cupsimagebase.so.2"
7730+
7731+
fi
7732+
DSO="\$(CC)"
7733+
DSOXX="\$(CXX)"
7734+
DSOFLAGS="$DSOFLAGS -Wl,-G -o \`basename \$@\`
7735+
LDFLAGS="$LDFLAGS $TLSFLAGS -liconv -lz -lm"
7736+
;; #(
77237737
*) :
77247738
77257739
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: Warning: Shared libraries may not work, trying -shared option." >&5

tools/ippeveprinter.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@
2727
#endif /* !CUPS_LITE */
2828

2929
#include <limits.h>
30+
#include <fcntl.h>
3031
#include <sys/stat.h>
3132

3233
#ifdef _WIN32
33-
# include <fcntl.h>
3434
# include <io.h>
3535
# include <process.h>
3636
# define WEXITSTATUS(s) (s)
@@ -41,7 +41,6 @@ typedef ULONG nfds_t;
4141
extern char **environ;
4242

4343
# include <spawn.h>
44-
# include <sys/fcntl.h>
4544
# include <sys/wait.h>
4645
# include <poll.h>
4746
#endif /* _WIN32 */

0 commit comments

Comments
 (0)