You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by fu...@apache.org on 2010/08/08 14:54:49 UTC
svn commit: r983409 - in /apr/apr/trunk/include: apr.hw
arch/win32/apr_private.h
Author: fuankg
Date: Sun Aug 8 12:54:49 2010
New Revision: 983409
URL: http://svn.apache.org/viewvc?rev=983409&view=rev
Log:
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.
Modified:
apr/apr/trunk/include/apr.hw
apr/apr/trunk/include/arch/win32/apr_private.h
Modified: apr/apr/trunk/include/apr.hw
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr.hw?rev=983409&r1=983408&r2=983409&view=diff
==============================================================================
--- apr/apr/trunk/include/apr.hw (original)
+++ apr/apr/trunk/include/apr.hw Sun Aug 8 12:54:49 2010
@@ -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
Modified: apr/apr/trunk/include/arch/win32/apr_private.h
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/arch/win32/apr_private.h?rev=983409&r1=983408&r2=983409&view=diff
==============================================================================
--- apr/apr/trunk/include/arch/win32/apr_private.h (original)
+++ apr/apr/trunk/include/arch/win32/apr_private.h Sun Aug 8 12:54:49 2010
@@ -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 */