Update our copyright for this year.

[apache] / os / unix / unixd.h

diff --git a/os/unix/unixd.h b/os/unix/unixd.h
index 1e6224ea03c65bf82b3f68465e548e2690f55a5a..ec777624333bddf3e73515228fe0c8028e8b0c4a 100644 (file)
--- a/os/unix/unixd.h
+++ b/os/unix/unixd.h
@@ -1,7 +1,7 @@
 /* ====================================================================
  * The Apache Software License, Version 1.1
  *
- * Copyright (c) 2000 The Apache Software Foundation.  All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation.  All rights
  * reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -61,6 +61,7 @@
 
 #include "httpd.h"
 #include "http_config.h"
+#include "ap_listen.h"
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
@@ -69,18 +70,23 @@
 #endif
 #include "apr_hooks.h"
 #include "apr_thread_proc.h"
+#include "apr_proc_mutex.h"
 
 #include <pwd.h>
 #include <grp.h>
+#ifdef APR_HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_IPC_H
+#include <sys/ipc.h>
+#endif
 
 typedef struct {
     uid_t uid;
     gid_t gid;
 } ap_unix_identity_t;
 
-AP_DECLARE_HOOK(ap_unix_identity_t *, get_suexec_identity,(const request_rec *r)
-)
+AP_DECLARE_HOOK(ap_unix_identity_t *, get_suexec_identity,(const request_rec *r))
 
 /* common stuff that unix MPMs will want */
 
@@ -100,53 +106,33 @@ typedef struct {
     gid_t group_id;
     int suexec_enabled;
 } unixd_config_rec;
-extern unixd_config_rec unixd_config;
-
-int unixd_setup_child(void);
-void unixd_pre_config(apr_pool_t *ptemp);
-const char *unixd_set_user(cmd_parms *cmd, void *dummy, const char *arg);
-const char *unixd_set_group(cmd_parms *cmd, void *dummy, const char *arg);
-#if defined(RLIMIT_CPU) || defined(RLIMIT_DATA) || defined(RLIMIT_VMEM) || \
-    defined(RLIMIT_NPROC) || defined(RLIMIT_AS)
+AP_DECLARE_DATA extern unixd_config_rec unixd_config;
+
+AP_DECLARE(int) unixd_setup_child(void);
+AP_DECLARE(void) unixd_pre_config(apr_pool_t *ptemp);
+AP_DECLARE(const char *) unixd_set_user(cmd_parms *cmd, void *dummy, 
+                                        const char *arg);
+AP_DECLARE(const char *) unixd_set_group(cmd_parms *cmd, void *dummy, 
+                                         const char *arg);
+#if defined(RLIMIT_CPU) || defined(RLIMIT_DATA) || defined(RLIMIT_VMEM) || defined(RLIMIT_NPROC) || defined(RLIMIT_AS)
 AP_DECLARE(void) unixd_set_rlimit(cmd_parms *cmd, struct rlimit **plimit,
                            const char *arg, const char * arg2, int type);
 #endif
-
-/* Information on signals for the various platforms */
-
-#if defined(NSIG)
-#define NumSIG NSIG
-#elif defined(_NSIG)
-#define NumSIG _NSIG
-#elif defined(__NSIG)
-#define NumSIG __NSIG
-#else
-#define NumSIG 33   /* breaks on OS/390 with < 33; 32 is o.k. for most */
-#endif
-
-#ifdef SYS_SIGLIST /* platform has sys_siglist[] */
-#define INIT_SIGLIST()  /* nothing */
-#elif defined(SYS_SIGLIST_DECLARED) /* from autoconf */
-#define INIT_SIGLIST()  /* nothing */
-#define SYS_SIGLIST sys_siglist
-#else
-#define NEED_AP_SYS_SIGLIST
-extern const char *ap_sys_siglist[NumSIG];
-#define SYS_SIGLIST ap_sys_siglist
-void unixd_siglist_init(void);
-#define INIT_SIGLIST() unixd_siglist_init();
-#endif /* platform has sys_siglist[] */
+AP_DECLARE(apr_status_t) unixd_set_proc_mutex_perms(apr_proc_mutex_t *pmutex);
+AP_DECLARE(apr_status_t) unixd_accept(void **accepted, ap_listen_rec *lr, apr_pool_t *ptrans);
 
 #ifdef HAVE_KILLPG
 #define unixd_killpg(x, y)     (killpg ((x), (y)))
+#define ap_os_killpg(x, y)      (killpg ((x), (y)))
 #else /* HAVE_KILLPG */
 #define unixd_killpg(x, y)     (kill (-(x), (y)))
+#define ap_os_killpg(x, y)      (kill (-(x), (y)))
 #endif /* HAVE_KILLPG */
 
 #define UNIX_DAEMON_COMMANDS   \
 AP_INIT_TAKE1("User", unixd_set_user, NULL, RSRC_CONF, \
   "Effective user id for this server"), \
 AP_INIT_TAKE1("Group", unixd_set_group, NULL, RSRC_CONF, \
-  "Effective group id for this server"),
+  "Effective group id for this server")
 
 #endif