Load cups into easysw/current.

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

diff --git a/scheduler/cupsd.h b/scheduler/cupsd.h
index e6f0fa0ed05f401ffe864bf8cfd903cb170dff90..dbdca8bef2c5b414cd0c93363d46966e1ffbbaa6 100644 (file)
--- a/scheduler/cupsd.h
+++ b/scheduler/cupsd.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: cupsd.h 5046 2006-02-01 22:11:58Z mike $"
+ * "$Id: cupsd.h 5305 2006-03-18 03:05:12Z mike $"
  *
  *   Main header file for the Common UNIX Printing System (CUPS) scheduler.
  *
@@ -65,6 +65,9 @@
  */
 
 #ifndef HAVE_HSTRERROR
+#  ifdef hstrerror
+#    undef hstrerror
+#  endif /* hstrerror */
 #  define hstrerror cups_hstrerror
 
 extern const char *cups_hstrerror(int);
@@ -160,16 +163,18 @@ VAR time_t                ReloadTime      VALUE(0);
                                        /* Time of reload request... */
 VAR int                        NeedReload      VALUE(RELOAD_ALL);
                                        /* Need to load configuration? */
+#ifdef HAVE_LAUNCH_H
+VAR int                        Launchd         VALUE(0);
+                                       /* Running from launchd */
+#endif /* HAVE_LAUNCH_H */
 
 
 /*
  * Prototypes...
  */
 
-extern void    cupsdCatchChildSignals(void);
 extern void    cupsdClearString(char **s);
 extern void    cupsdHoldSignals(void);
-extern void    cupsdIgnoreChildSignals(void);
 extern void    cupsdReleaseSignals(void);
 extern void    cupsdSetString(char **s, const char *v);
 extern void    cupsdSetStringf(char **s, const char *f, ...)
@@ -182,7 +187,6 @@ extern void cupsdStopServer(void);
 extern void    cupsdClosePipe(int *fds);
 extern int     cupsdOpenPipe(int *fds);
 
-extern void    cupsdClearEnv(void);
 extern void    cupsdInitEnv(void);
 extern int     cupsdLoadEnv(char *envp[], int envmax);
 extern void    cupsdSetEnv(const char *name, const char *value);
@@ -200,5 +204,5 @@ extern int  cupsdStartProcess(const char *command, char *argv[],
 
 
 /*
- * End of "$Id: cupsd.h 5046 2006-02-01 22:11:58Z mike $".
+ * End of "$Id: cupsd.h 5305 2006-03-18 03:05:12Z mike $".
  */