Switch to _WIN32 for Windows test.

[thirdparty/cups.git] / scheduler / cupsd.h

diff --git a/scheduler/cupsd.h b/scheduler/cupsd.h
index 12806624605968abb96037e87a744491dd80c67f..08e1abebd883b32bdb81f12a5713287f36f6be30 100644 (file)
--- a/scheduler/cupsd.h
+++ b/scheduler/cupsd.h
@@ -1,9 +1,7 @@
 /*
- * "$Id$"
- *
  * Main header file for the CUPS scheduler.
  *
- * Copyright 2007-2014 by Apple Inc.
+ * Copyright 2007-2016 by Apple Inc.
  * Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  * These coded instructions, statements, and computer programs are the
@@ -20,6 +18,7 @@
 
 #include <cups/cups-private.h>
 #include <cups/file-private.h>
+#include <cups/ppd-private.h>
 
 #include <limits.h>
 #include <time.h>
@@ -31,11 +30,11 @@
 #include <sys/stat.h>
 #include <sys/wait.h>
 
-#ifdef WIN32
+#ifdef _WIN32
 #  include <direct.h>
 #else
 #  include <unistd.h>
-#endif /* WIN32 */
+#endif /* _WIN32 */
 
 #include "mime.h"
 
@@ -158,10 +157,10 @@ VAR int                   NeedReload      VALUE(RELOAD_ALL),
 VAR void               *DefaultProfile VALUE(0);
                                        /* Default security profile */
 
-#ifdef HAVE_LAUNCH_H
-VAR int                        Launchd         VALUE(0);
-                                       /* Running from launchd */
-#endif /* HAVE_LAUNCH_H */
+#ifdef HAVE_ONDEMAND
+VAR int                        OnDemand        VALUE(0);
+                                       /* Launched on demand */
+#endif /* HAVE_ONDEMAND */
 
 
 /*
@@ -204,8 +203,7 @@ extern void         cupsdSetStringf(char **s, const char *f, ...)
 extern void            *cupsdCreateProfile(int job_id, int allow_networking);
 extern void            cupsdDestroyProfile(void *profile);
 extern int             cupsdEndProcess(int pid, int force);
-extern const char      *cupsdFinishProcess(int pid, char *name, int namelen,
-                                           int *job_id);
+extern const char      *cupsdFinishProcess(int pid, char *name, size_t namelen, int *job_id);
 extern int             cupsdStartProcess(const char *command, char *argv[],
                                          char *envp[], int infd, int outfd,
                                          int errfd, int backfd, int sidefd,
@@ -226,8 +224,3 @@ extern void         cupsdStopSelect(void);
 /* server.c */
 extern void            cupsdStartServer(void);
 extern void            cupsdStopServer(void);
-
-
-/*
- * End of "$Id$".
- */