fielding 01/01/28 02:33:53
Modified: . CHANGES
include apr_general.h
lib apr_pools.c
Log:
Eliminate the APR_SIG* aliases for standard signal names,
since they serve no useful purpose.
Revision Changes Path
1.48 +3 -0 apr/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apr/CHANGES,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- CHANGES 2001/01/28 01:34:25 1.47
+++ CHANGES 2001/01/28 10:33:50 1.48
@@ -1,5 +1,8 @@
Changes with APR b1
+ *) Eliminate the APR_SIG* aliases for standard signal names,
+ since they serve no useful purpose. [Roy Felding]
+
*) Abstracted apr_get_username and apr_get_groupname for unix and win32.
Modified Win32 apr_uid_t and apr_gid_t to use PSIDs, and elimintated
the uid_t and gid_t definitions.
1.50 +0 -91 apr/include/apr_general.h
Index: apr_general.h
===================================================================
RCS file: /home/cvs/apr/include/apr_general.h,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- apr_general.h 2001/01/24 08:26:19 1.49
+++ apr_general.h 2001/01/28 10:33:51 1.50
@@ -78,97 +78,6 @@
typedef int apr_signum_t;
-#ifdef SIGHUP
-#define APR_SIGHUP SIGHUP
-#endif
-#ifdef SIGINT
-#define APR_SIGINT SIGINT
-#endif
-#ifdef SIGQUIT
-#define APR_SIGQUIT SIGQUIT
-#endif
-#ifdef SIGILL
-#define APR_SIGILL SIGILL
-#endif
-#ifdef SIGTRAP
-#define APR_SIGTRAP SIGTRAP
-#endif
-#ifdef SIGABRT
-#define APR_SIGABRT SIGABRT
-#endif
-#ifdef SIGIOT
-#define APR_SIGIOT SIGIOT
-#endif
-#ifdef SIGBUS
-#define APR_SIGBUS SIGBUS
-#endif
-#ifdef SIGFPE
-#define APR_SIGFPE SIGFPE
-#endif
-#ifdef SIGKILL
-#define APR_SIGKILL SIGKILL
-#endif
-#ifdef SIGUSR1
-#define APR_SIGUSR1 SIGUSR1
-#endif
-#ifdef SIGSEGV
-#define APR_SIGSEGV SIGSEGV
-#endif
-#ifdef SIGUSR2
-#define APR_SIGUSR2 SIGUSR2
-#endif
-#ifdef SIGPIPE
-#define APR_SIGPIPE SIGPIPE
-#endif
-#ifdef SIGALRM
-#define APR_SIGALRM SIGALRM
-#endif
-#ifdef SIGTERM
-#define APR_SIGTERM SIGTERM
-#endif
-#ifdef SIGSTKFLT
-#define APR_SIGSTKFLT SIGSTKFLT
-#endif
-#ifdef SIGCHLD
-#define APR_SIGCHLD SIGCHLD
-#endif
-#ifdef SIGCONT
-#define APR_SIGCONT SIGCONT
-#endif
-#ifdef SIGSTOP
-#define APR_SIGSTOP SIGSTOP
-#endif
-#ifdef SIGTSTP
-#define APR_SIGTSTP SIGTSTP
-#endif
-#ifdef SIGTTIN
-#define APR_SIGTTIN SIGTTIN
-#endif
-#ifdef SIGTTOU
-#define APR_SIGTTOU SIGTTOU
-#endif
-#ifdef SIGURG
-#define APR_SIGURG SIGURG
-#endif
-#ifdef SIGXCPU
-#define APR_SIGXCPU SIGXCPU
-#endif
-#ifdef SIGXFSZ
-#define APR_SIGXFSZ SIGXFSZ
-#endif
-#ifdef SIGVTALRM
-#define APR_SIGVTALRM SIGVTALRM
-#endif
-#ifdef SIGPROF
-#define APR_SIGPROF SIGPROF
-#endif
-#ifdef SIGWINCH
-#define APR_SIGWINCH SIGWINCH
-#endif
-#ifdef SIGIO
-#define APR_SIGIO SIGIO
-#endif
-
#ifdef WIN32
#define APR_INLINE __inline
#elif defined(__GNUC__) && defined(__GNUC__) && \
1.84 +3 -3 apr/lib/apr_pools.c
Index: apr_pools.c
===================================================================
RCS file: /home/cvs/apr/lib/apr_pools.c,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- apr_pools.c 2001/01/11 06:25:07 1.83
+++ apr_pools.c 2001/01/28 10:33:52 1.84
@@ -1255,13 +1255,13 @@
#ifdef WIN32
need_timeout = 1;
#else
- if (apr_kill(p->pid, APR_SIGTERM) == APR_SUCCESS) {
+ if (apr_kill(p->pid, SIGTERM) == APR_SUCCESS) {
need_timeout = 1;
}
#endif
}
else if (p->kill_how == kill_always) {
- apr_kill(p->pid, APR_SIGKILL);
+ apr_kill(p->pid, SIGKILL);
}
}
@@ -1276,7 +1276,7 @@
*/
for (p = procs; p; p = p->next) {
if (p->kill_how == kill_after_timeout) {
- apr_kill(p->pid, APR_SIGKILL);
+ apr_kill(p->pid, SIGKILL);
}
}
#ifdef WIN32
