Merge pull request #5410 from AOSC-Dev/master

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

diff --git a/scheduler/cupsd.h b/scheduler/cupsd.h
index d0f8fb5c4b2acea418499d331284c43dfdc92ee9..bc1350e7e7640376469a6744a0b6fd875cea1dcf 100644 (file)
--- a/scheduler/cupsd.h
+++ b/scheduler/cupsd.h
@@ -1,16 +1,11 @@
 /*
- * "$Id$"
- *
  * Main header file for the CUPS scheduler.
  *
- * Copyright 2007-2014 by Apple Inc.
- * Copyright 1997-2007 by Easy Software Products, all rights reserved.
+ * Copyright © 2007-2018 by Apple Inc.
+ * Copyright © 1997-2007 by Easy Software Products, all rights reserved.
  *
- * These coded instructions, statements, and computer programs are the
- * property of Apple Inc. and are protected by Federal copyright
- * law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- * "LICENSE" which should have been included with this file.  If this
- * file is missing or damaged, see the license at "http://www.cups.org/".
+ * Licensed under Apache License v2.0.  See the file "LICENSE" for more
+ * information.
  */
 
 
@@ -20,6 +15,7 @@
 
 #include <cups/cups-private.h>
 #include <cups/file-private.h>
+#include <cups/ppd-private.h>
 
 #include <limits.h>
 #include <time.h>
@@ -31,11 +27,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 +154,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 */
 
 
 /*
@@ -172,8 +168,7 @@ VAR int                     Launchd         VALUE(0);
 extern void            cupsdInitEnv(void);
 extern int             cupsdLoadEnv(char *envp[], int envmax);
 extern void            cupsdSetEnv(const char *name, const char *value);
-extern void            cupsdSetEnvf(const char *name, const char *value, ...)
-                       __attribute__ ((__format__ (__printf__, 2, 3)));
+extern void            cupsdSetEnvf(const char *name, const char *value, ...) _CUPS_FORMAT(2, 3);
 extern void            cupsdUpdateEnv(void);
 
 /* file.c */
@@ -225,8 +220,3 @@ extern void         cupsdStopSelect(void);
 /* server.c */
 extern void            cupsdStartServer(void);
 extern void            cupsdStopServer(void);
-
-
-/*
- * End of "$Id$".
- */