Fix compile problems...

scheduler/conf.c:
    - Always include <syslog.h> now.

scheduler/cups-driverd.c:
    - list_ppds(): Don't take sizeof(sync), but sizeof(ppdsync).

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

diff --git a/scheduler/conf.c b/scheduler/conf.c
index 20aaa053e7ef388037a49e50f1741719ba6bd4fb..b662ba504251be3e861a03f4ac0882108c4ca60b 100644 (file)
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -45,12 +45,9 @@
 #include <stdarg.h>
 #include <grp.h>
 #include <sys/utsname.h>
+#include <syslog.h>
 #include <cups/dir.h>
 
-#ifdef HAVE_VSYSLOG
-#  include <syslog.h>
-#endif /* HAVE_VSYSLOG */
-
 
 /*
  * Possibly missing network definitions...

diff --git a/scheduler/cups-driverd.c b/scheduler/cups-driverd.c
index 756a9817305be80d0fe6b173741421a30fad5465..0a19ccf18c9ae6ac762fcbb7922eedbf1d382029 100644 (file)
--- a/scheduler/cups-driverd.c
+++ b/scheduler/cups-driverd.c
@@ -596,8 +596,9 @@ list_ppds(int        request_id,    /* I - Request ID */
             == sizeof(ppdsync) &&
         ppdsync == PPD_SYNC &&
         !stat(filename, &fileinfo) &&
-       (fileinfo.st_size - sizeof(sync) % sizeof(ppd_rec_t)) == 0 &&
-       (NumPPDs = (fileinfo.st_size - sizeof(sync)) / sizeof(ppd_rec_t)) > 0)
+       (fileinfo.st_size - sizeof(ppdsync) % sizeof(ppd_rec_t)) == 0 &&
+       (NumPPDs = (fileinfo.st_size - sizeof(ppdsync)) /
+                  sizeof(ppd_rec_t)) > 0)
     {
      /*
       * We have a ppds.dat file, so read it!