Return-Path: Delivered-To: apmail-apr-cvs-archive@apr.apache.org Received: (qmail 12625 invoked by uid 500); 23 Jul 2002 17:01:58 -0000 Mailing-List: contact cvs-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: Reply-To: dev@apr.apache.org Delivered-To: mailing list cvs@apr.apache.org Received: (qmail 12606 invoked from network); 23 Jul 2002 17:01:58 -0000 Date: 23 Jul 2002 17:01:57 -0000 Message-ID: <20020723170157.56395.qmail@icarus.apache.org> From: rbb@apache.org To: apr-cvs@apache.org Subject: cvs commit: apr/threadproc/unix signals.c X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N rbb 2002/07/23 10:01:57 Modified: threadproc/unix signals.c Log: The old macro was blowing up on some platforms that weren't using gcc. Specifically, True64 with the cc compiler. This resolves that problem by using a cleaner macro. Revision Changes Path 1.49 +8 -2 apr/threadproc/unix/signals.c Index: signals.c =================================================================== RCS file: /home/cvs/apr/threadproc/unix/signals.c,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- signals.c 8 Jun 2002 18:47:56 -0000 1.48 +++ signals.c 23 Jul 2002 17:01:57 -0000 1.49 @@ -167,8 +167,14 @@ static const char *signal_description[APR_NUMSIG]; #define store_desc(index, string) \ - (assert(index < APR_NUMSIG), \ - signal_description[index] = string) + do { \ + if (index >= APR_NUMSIG) { \ + assert(index < APR_NUMSIG); \ + } \ + else { \ + signal_description[index] = string; \ + } \ + } while (0) void apr_signal_init(apr_pool_t *pglobal) {