[gs-commits] ghostpdl branch, master, updated. jbig2dec-0.14-2017-gb46142c

The ghostpdl branch, master has been updated
       via  b46142c94bde32f620bda18e3bc5912fbf999446 (commit)
       via  a4c78f01d9a1bd9862b575f33aa48afddd167005 (commit)
      from  3bf992e26006c8af9e137822159eb7c7540462c0 (commit)

----------------------------------------------------------------------
commit b46142c94bde32f620bda18e3bc5912fbf999446
Author: Chris Liddell <[email protected]>
Date:   Fri Dec 6 21:45:09 2019 +0000

    Bug 701973: Fix gssprintf.c includes for PRI macros
    
    The header inclusion in gssprintf.c meant the definitions of the PRI macros
    for string formatting could be inconsistent with other source files.
    
    Adding the appropriate headers in the correct order resolves that issue.

diff --git a/base/gssprintf.c b/base/gssprintf.c
index 49f54bd..aab4051 100644
--- a/base/gssprintf.c
+++ b/base/gssprintf.c
@@ -16,8 +16,9 @@
 /* From: https://svn.apache.org/repos/asf/apr/apr/trunk/strings/apr_snprintf.c */
 /* Additional modifications to work outside Apache for use with Ghostscript */
 
+#include "unistd_.h"
+#include "gp.h"
 #include "stdio_.h"
-#include "stdint_.h"
 #include "string_.h"
 #include <stdarg.h>
 #include "math_.h"
diff --git a/base/lib.mak b/base/lib.mak
index 534e2dc..7e8f431 100644
--- a/base/lib.mak
+++ b/base/lib.mak
@@ -382,8 +382,8 @@ $(AUX)gsutil.$(OBJ) : $(GLSRC)gsutil.c $(AK) $(memory__h) $(string__h)\
  $(gsrect_h) $(gsuid_h) $(gsutil_h) $(LIB_MAK) $(MAKEDIRS)
 	$(GLCCAUX) $(C_) $(AUXO_)gsutil.$(OBJ) $(GLSRC)gsutil.c
 
-$(GLOBJ)gssprintf.$(OBJ) : $(GLSRC)gssprintf.c $(gssprintf_h) $(stdio__h) \
- $(stdint__h) $(string__h) $(math__h)
+$(GLOBJ)gssprintf.$(OBJ) : $(GLSRC)gssprintf.c $(gssprintf_h) $(unistd__h) \
+ $(gp_h) $(stdio__h) $(stdint__h) $(string__h) $(math__h)
 	$(GLCC) $(GLO_)gssprintf.$(OBJ) $(C_) $(GLSRC)gssprintf.c
 
 $(GLOBJ)gsstrtok.$(OBJ) : $(GLSRC)gsstrtok.c $(gsstrtok_h) $(string__h)

----------------------------------------------------------------------
commit a4c78f01d9a1bd9862b575f33aa48afddd167005
Author: Chris Liddell <[email protected]>
Date:   Fri Dec 6 21:44:13 2019 +0000

    Fix configure based build for post-Sun Solaris releases

diff --git a/base/stdint_.h b/base/stdint_.h
index 7da1457..39ab5ac 100644
--- a/base/stdint_.h
+++ b/base/stdint_.h
@@ -227,6 +227,9 @@ typedef unsigned long long uint64_t;
 #    define PRIiSIZE "lli"
 #   endif
 #  endif
+#  ifndef PRIx64
+#    define PRIx64 PRIxSIZE
+#  endif
 # endif
 
 #endif /* stdint__INCLUDED */
diff --git a/configure.ac b/configure.ac
index adbbc71..11df330 100644
--- a/configure.ac
+++ b/configure.ac
@@ -310,7 +310,7 @@ case $host in
         fi
         SET_DT_SONAME=""
         ;;
-        *-sun*)
+        *-sun*|*-solaris*)
         CC_OPT_FLAGS_TO_TRY="-O2"
         CFLAGS_LARGEFILE="-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
         # the trailing space is required!
@@ -2202,7 +2202,7 @@ if test x$no_x != xyes; then
         if test ! "$x_libraries" = "NONE" -a ! "$x_libraries" = ""; then
                 X_LDFLAGS="-L$x_libraries"
                 case $host in
-                    *-sun*)
+                    *-sun*|*-solaris*)
                         X_LDFLAGS="$X_LDFLAGS -R$x_libraries"
                     ;;
                     *)
@@ -2784,7 +2784,7 @@ case $host in
       DYNAMIC_LIBS=""
       SO_LIB_EXT=".dylib"
     ;;
-    *-sun*)
+    *-sun*|*-solaris*)
       if test $ac_cv_prog_gcc = yes; then
         DYNAMIC_CFLAGS="-fPIC $DYNAMIC_CFLAGS"
       else
@@ -2879,7 +2879,7 @@ AC_ARG_ENABLE([dynamic], AC_HELP_STRING([--enable-dynamic],
         OPT_CFLAGS="$DYNAMIC_CFLAGS $OPT_CFLAGS"
         DBG_CFLAGS="$DYNAMIC_CFLAGS $DBG_CFLAGS"
       ;;
-      *-sun*)
+      *-sun*|*-solaris*)
         DYNAMIC_DEVS="\$(GLOBJDIR)/X11.so"
         DYNAMIC_FLAGS="-DGS_DEVS_SHARED -DGS_DEVS_SHARED_DIR=\\\"\$(gssharedir)\\\""
         OPT_CFLAGS="$DYNAMIC_CFLAGS $OPT_CFLAGS"
@@ -3067,7 +3067,7 @@ AC_ARG_WITH(memory-alignment,
 
 if test x"$GS_MEMPTR_ALIGNMENT" = xcheck ; then
   case $host in
-    *hpux*|*-sun*|*-aix*)
+    *hpux*|*-sun*|*-aix*|*-solaris*)
      GS_MEMPTR_ALIGNMENT=8
     ;;
     *)


Summary of changes:
 base/gssprintf.c |  3 ++-
 base/lib.mak     |  4 ++--
 base/stdint_.h   |  3 +++
 configure.ac     | 10 +++++-----
 4 files changed, 12 insertions(+), 8 deletions(-)