-Ae is only for the HP C compiler, not the C++ compiler.

Casts for HP-UX...

Mark some statically defined functions static...

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

diff --git a/backend/socket.c b/backend/socket.c
index 89fe88d833be6ff46dda63005c8147e535798325..f131d7903c3f5f0e504f07a7bc9e0d7098d62c68 100644 (file)
--- a/backend/socket.c
+++ b/backend/socket.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: socket.c,v 1.18 2001/04/12 17:25:03 mike Exp $"
+ * "$Id: socket.c,v 1.19 2001/04/18 16:28:34 mike Exp $"
  *
  *   AppSocket backend for the Common UNIX Printing System (CUPS).
  *
@@ -259,7 +259,11 @@ main(int  argc,            /* I - Number of command-line arguments (6 or 7) */
 
       FD_ZERO(&input);
       FD_SET(fd, &input);
+#ifdef __hpux
+      if (select(fd + 1, (int *)&input, NULL, NULL, &timeout) > 0)
+#else
       if (select(fd + 1, &input, NULL, NULL, &timeout) > 0)
+#endif /* __hpux */
       {
        /*
        * Grab the data coming back and spit it out to stderr...
@@ -294,7 +298,11 @@ main(int  argc,            /* I - Number of command-line arguments (6 or 7) */
       FD_ZERO(&input);
       FD_SET(fd, &input);
 
+#ifdef __hpux
+      if (select(fd + 1, (int *)&input, NULL, NULL, &timeout) > 0)
+#else
       if (select(fd + 1, &input, NULL, NULL, &timeout) > 0)
+#endif /* __hpux */
       {
        /*
        * Grab the data coming back and spit it out to stderr...
@@ -329,5 +337,5 @@ main(int  argc,             /* I - Number of command-line arguments (6 or 7) */
 
 
 /*
- * End of "$Id: socket.c,v 1.18 2001/04/12 17:25:03 mike Exp $".
+ * End of "$Id: socket.c,v 1.19 2001/04/18 16:28:34 mike Exp $".
  */

diff --git a/configure.in b/configure.in
index 5964218e2fd1e4bd167d3cde941fe9ef6481ba27..de52b362d7eca350023c06334205e8800591a014 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: configure.in,v 1.84 2001/04/18 12:55:35 mike Exp $"
+dnl "$Id: configure.in,v 1.85 2001/04/18 16:28:34 mike Exp $"
 dnl
 dnl   Configuration script for the Common UNIX Printing System (CUPS).
 dnl
@@ -361,8 +361,9 @@ else
                                OPTIM="+O2"
                                GSOPTIM="+O1"
                        fi
-                       OPTIM="-Ae +DAportable $OPTIM"
-                       GSOPTIM="-Ae +DAportable $GSOPTIM"
+                       CFLAGS="-Ae $CFLAGS"
+                       OPTIM="+DAportable $OPTIM"
+                       GSOPTIM="+DAportable $GSOPTIM"
                        if test $PICFLAG = 1; then
                                OPTIM="+z $OPTIM"
                                GSOPTIM="+z $GSOPTIM"
@@ -680,5 +681,5 @@ AC_DEFINE_UNQUOTED(CUPS_FONTPATH, "$fontpath")
 AC_OUTPUT(Makedefs cups.sh)
 
 dnl
-dnl End of "$Id: configure.in,v 1.84 2001/04/18 12:55:35 mike Exp $".
+dnl End of "$Id: configure.in,v 1.85 2001/04/18 16:28:34 mike Exp $".
 dnl

diff --git a/cups/ppd.c b/cups/ppd.c
index 6c78af99f3407ded6d309cc5c3b74392866c904a..6c47de2c7dfc160e53d72057d5e34a478f831667 100644 (file)
--- a/cups/ppd.c
+++ b/cups/ppd.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: ppd.c,v 1.51 2001/02/15 13:34:15 mike Exp $"
+ * "$Id: ppd.c,v 1.52 2001/04/18 16:28:34 mike Exp $"
  *
  *   PPD file routines for the Common UNIX Printing System (CUPS).
  *
@@ -1425,7 +1425,7 @@ ppdOpenFile(const char *filename) /* I - File to read from */
  * 'compare_strings()' - Compare two strings.
  */
 
-int                            /* O - Result of comparison */
+static int                     /* O - Result of comparison */
 compare_strings(char *s,       /* I - First string */
                 char *t)       /* I - Second string */
 {
@@ -1935,5 +1935,5 @@ ppd_fix(char *string)             /* IO - String to fix */
 
 
 /*
- * End of "$Id: ppd.c,v 1.51 2001/02/15 13:34:15 mike Exp $".
+ * End of "$Id: ppd.c,v 1.52 2001/04/18 16:28:34 mike Exp $".
  */