Fix builds on OpenBSD (STR #4195)

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@10627 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/CHANGES-1.6.txt b/CHANGES-1.6.txt
index 9f18fd32facf4fa5b90dc76d28b99f3b8d38abe1..c9ff353a12612e1960c74c6a0179ae7cbc853a43 100644 (file)
--- a/CHANGES-1.6.txt
+++ b/CHANGES-1.6.txt
@@ -4,6 +4,7 @@ CHANGES-1.6.txt
 CHANGES IN CUPS V1.6.2
 
        - Documentation fixes
+       - OpenBSD build fix (STR #4195)
        - The scheduler could crash when using Avahi (STR #4183, STR #4192)
        - The IPP backend could get stuck in an endless loop on certain network
          errors (STR #4194)

diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4
index 175b272427a9287fad0cec7cca829637b60aafa3..7c449f09fce42359607f445e5427e3ba437b5c34 100644 (file)
--- a/config-scripts/cups-common.m4
+++ b/config-scripts/cups-common.m4
@@ -130,6 +130,7 @@ AC_CHECK_HEADER(crypt.h,AC_DEFINE(HAVE_CRYPT_H))
 AC_CHECK_HEADER(langinfo.h,AC_DEFINE(HAVE_LANGINFO_H))
 AC_CHECK_HEADER(malloc.h,AC_DEFINE(HAVE_MALLOC_H))
 AC_CHECK_HEADER(shadow.h,AC_DEFINE(HAVE_SHADOW_H))
+AC_CHECK_HEADER(stdint.h,AC_DEFINE(HAVE_STDINT_H))
 AC_CHECK_HEADER(string.h,AC_DEFINE(HAVE_STRING_H))
 AC_CHECK_HEADER(strings.h,AC_DEFINE(HAVE_STRINGS_H))
 AC_CHECK_HEADER(bstring.h,AC_DEFINE(HAVE_BSTRING_H))

diff --git a/config.h.in b/config.h.in
index b29131cdece6782e71b09667ad88ccd8992d2602..6062da4b52f85f2931a08a97b9b2b97e69fd8aa9 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -174,6 +174,13 @@
 #undef HAVE_SCSI_SG_H
 
 
+/*
+ * Use <stdint.h>?
+ */
+
+#undef HAVE_STDINT_H
+
+
 /*
  * Use <string.h>, <strings.h>, and/or <bstring.h>?
  */

diff --git a/filter/raster.c b/filter/raster.c
index 3bbd4ad1ff64a5ed08f88a5d59d63d2adb5c55a1..801129e603e00e752543a9bfe101f1432bdda6d8 100644 (file)
--- a/filter/raster.c
+++ b/filter/raster.c
@@ -46,6 +46,9 @@
  */
 
 #include <cups/raster-private.h>
+#ifdef HAVE_STDINT_H
+#  include <stdint.h>
+#endif /* HAVE_STDINT_H */
 
 
 /*