diff options
| author | Guenter Knauf <fuankg@apache.org> | 2010-08-08 12:54:49 +0000 |
|---|---|---|
| committer | Guenter Knauf <fuankg@apache.org> | 2010-08-08 12:54:49 +0000 |
| commit | 0c6f7e52c18b5331670914c4a300f9efff10f3f8 (patch) | |
| tree | 005c93372d48216b8c70132800a2ef01171e0c79 | |
| parent | 2727dfaa768551bf955e3ea461f30af47151c4a0 (diff) | |
| download | apr-0c6f7e52c18b5331670914c4a300f9efff10f3f8.tar.gz | |
Reverted r982101 because it doesnt work.
This whole redifine of the SIG macros is bogus. Other compilers
might silently ignore redines, but Watcom breaks, and for good reason.
I see that these redefines cant work properly because its only a matter
of the order of the headers: if signal.h is included first then these
redefines in apr_private.h might win - if f.e. as with httpd - apr.h is
included first then those from signal.h win. We should really use own
macro definitions prefixed with APR_ to make sure that we always use same
definitions.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@983409 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | include/apr.hw | 4 | ||||
| -rw-r--r-- | include/arch/win32/apr_private.h | 6 |
2 files changed, 2 insertions, 8 deletions
diff --git a/include/apr.hw b/include/apr.hw index 0b41f9b95..4534eff7f 100644 --- a/include/apr.hw +++ b/include/apr.hw @@ -132,11 +132,7 @@ #define APR_HAVE_NETINET_TCP_H 0 #define APR_HAVE_PTHREAD_H 0 #define APR_HAVE_SEMAPHORE_H 0 -#ifdef __WATCOMC__ -#define APR_HAVE_SIGNAL_H 0 -#else #define APR_HAVE_SIGNAL_H APR_NOT_IN_WCE -#endif #define APR_HAVE_STDARG_H APR_NOT_IN_WCE #define APR_HAVE_STDDEF_H APR_NOT_IN_WCE #define APR_HAVE_STDINT_H 0 diff --git a/include/arch/win32/apr_private.h b/include/arch/win32/apr_private.h index ef6bf9394..10e4656d1 100644 --- a/include/arch/win32/apr_private.h +++ b/include/arch/win32/apr_private.h @@ -60,11 +60,7 @@ #define HAVE_LIMITS_H 1 #define HAVE_MALLOC_H 1 #define HAVE_PROCESS_H APR_NOT_IN_WCE -#ifdef __WATCOMC__ -#define HAVE_SIGNAL_H 0 -#else #define HAVE_SIGNAL_H 1 -#endif #define HAVE_STDDEF_H APR_NOT_IN_WCE #define HAVE_STDLIB_H 1 @@ -74,6 +70,7 @@ #define HAVE_STRSTR 1 #define HAVE_MEMCHR 1 +#ifndef __WATCOMC__ #define SIGHUP 1 /* 2 is used for SIGINT on windows */ #define SIGQUIT 3 @@ -86,6 +83,7 @@ #define SIGUSR1 10 /* 11 is used for SIGSEGV on windows */ #define SIGUSR2 12 +#endif #define SIGPIPE 13 #define SIGALRM 14 /* 15 is used for SIGTERM on windows */ |