[PATCH] Borland C++ Builder signals

[Saxon Druce <sa...@blocksoftware.com>]

Hi,

The patch below fixes about a hundred warnings like this:

[C++ Warning] signal.h(65): W8017 Redefinition of 'SIGUSR1' is not identical
[C++ Warning] signal.h(66): W8017 Redefinition of 'SIGUSR2' is not identical
[C++ Warning] apr_private.h(132): W8017 Redefinition of 'SIGUSR1' is not
identical
[C++ Warning] apr_private.h(134): W8017 Redefinition of 'SIGUSR2' is not
identical

When compiling APR using Borland C++ Builder, as discussed in the other
email called 'Borland C++ Builder signals'.

Thanks,
Saxon

--------------------------------------------------------------------

--- apr/include/arch/win32/apr_private.h.old    Tue May 13 14:35:29 2003
+++ apr/include/arch/win32/apr_private.h        Wed May 14 08:14:42 2003
@@ -105,6 +105,10 @@
 #include <time.h>
 #endif

+#if APR_HAVE_SIGNAL_H
+#include <signal.h>
+#endif
+
 /* Use this section to define all of the HAVE_FOO_H
  * that are required to build properly.
  */
@@ -129,14 +133,20 @@
 #define SIGBUS     7
 /* 8 is used for SIGFPE on windows */
 #define SIGKILL    9
-#define SIGUSR1    10
+#define SIGSTKFLT  10
 /* 11 is used for SIGSEGV on windows */
-#define SIGUSR2    12
+#define SIGCHLD    12
 #define SIGPIPE    13
 #define SIGALRM    14
 /* 15 is used for SIGTERM on windows */
-#define SIGSTKFLT  16
-#define SIGCHLD    17
+#ifndef SIGUSR1
+/* 16 is used for SIGUSR1 with Borland C++ */
+#define SIGUSR1    16
+#endif
+#ifndef SIGUSR2
+/* 17 is used for SIGUSR2 with Borland C++ */
+#define SIGUSR2    17
+#endif
 #define SIGCONT    18
 #define SIGSTOP    19
 #define SIGTSTP    20