Return-Path: Delivered-To: apmail-apr-dev-archive@apr.apache.org Received: (qmail 5250 invoked by uid 500); 3 Jun 2003 00:12:24 -0000 Mailing-List: contact dev-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: Delivered-To: mailing list dev@apr.apache.org Received: (qmail 5233 invoked from network); 3 Jun 2003 00:12:23 -0000 Message-ID: <002d01c32964$c7f4e650$82db26cb@saxon> From: "Saxon Druce" To: "APR dev" Subject: [PATCH] Borland C++ Builder signals Date: Tue, 3 Jun 2003 08:12:11 +0800 MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit X-Priority: 3 X-MSMail-Priority: Normal X-Mailer: Microsoft Outlook Express 6.00.2800.1106 X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2800.1106 X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N Hi, This is a repost of the patch below which I submitted about three weeks ago. Thanks, Saxon --------------------------------------------------------------- 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 #endif +#if APR_HAVE_SIGNAL_H +#include +#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