Get rid of some HP-UX compiler warnings.

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

diff --git a/backend/socket.c b/backend/socket.c
index 93a5f76bfb1d96ccfc241b23920d02aeab6365f6..b7dd980ca62a5efc43beda774c5308cc4b9f503f 100644 (file)
--- a/backend/socket.c
+++ b/backend/socket.c
@@ -340,11 +340,7 @@ main(int  argc,                            /* I - Number of command-line arguments (6 or 7) */
       FD_ZERO(&input);
       FD_SET(device_fd, &input);
 
-#ifdef __hpux
-      if (select(device_fd + 1, (int *)&input, NULL, NULL, &timeout) > 0)
-#else
       if (select(device_fd + 1, &input, NULL, NULL, &timeout) > 0)
-#endif /* __hpux */
       {
        /*
        * Grab the data coming back and spit it out to stderr...

diff --git a/scheduler/auth.c b/scheduler/auth.c
index c1d397d900a24f440f2bfb7e35ba678f67a22505..80596eacf9e3f72b32390901a16affe9a1c44094 100644 (file)
--- a/scheduler/auth.c
+++ b/scheduler/auth.c
@@ -489,13 +489,13 @@ cupsdAuthorize(cupsd_client_t *con)       /* I - Client connection */
             strlcpy(data.username, username, sizeof(data.username));
            strlcpy(data.password, password, sizeof(data.password));
 
-#  ifdef __sun
+#  if defined(__sun) || defined(__hpux)
            pamdata.conv        = (int (*)(int, struct pam_message **,
                                           struct pam_response **,
                                           void *))pam_func;
 #  else
            pamdata.conv        = pam_func;
-#  endif /* __sun */
+#  endif /* __sun || __hpux */
            pamdata.appdata_ptr = &data;
 
 #  ifdef __hpux

diff --git a/scheduler/banners.c b/scheduler/banners.c
index c7e6eb533cb9083b5bedd1acb73ad6044f1d58e4..74e8d188273d6a7ff99dc5cdb3c98ed583ec9b04 100644 (file)
--- a/scheduler/banners.c
+++ b/scheduler/banners.c
@@ -195,7 +195,7 @@ compare_banners(
  * 'free_banners()' - Free all banners.
  */
 
-void
+static void
 free_banners(void)
 {
   cupsd_banner_t       *temp;          /* Current banner */

diff --git a/scheduler/quotas.c b/scheduler/quotas.c
index e00f6ae37773eb3939917d352d0ad0a19e2585e8..53e418f5a93cffc7ec4ad6b9bcf8b68cf69cfb39 100644 (file)
--- a/scheduler/quotas.c
+++ b/scheduler/quotas.c
@@ -166,7 +166,7 @@ cupsdUpdateQuota(
  * 'add_quota()' - Add a quota record for this printer and user.
  */
 
-cupsd_quota_t *                                /* O - Quota data */
+static cupsd_quota_t *                 /* O - Quota data */
 add_quota(cupsd_printer_t *p,          /* I - Printer */
           const char      *username)   /* I - User */
 {
@@ -209,7 +209,7 @@ compare_quotas(const cupsd_quota_t *q1,     /* I - First quota record */
  * 'find_quota()' - Find a quota record.
  */
 
-cupsd_quota_t *                                /* O - Quota data */
+static cupsd_quota_t *                 /* O - Quota data */
 find_quota(cupsd_printer_t *p,         /* I - Printer */
            const char      *username)  /* I - User */
 {