From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 7778 invoked by alias); 15 Nov 2001 18:03:11 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Received: (qmail 7733 invoked from network); 15 Nov 2001 18:03:08 -0000 Received: from unknown (HELO cygnus.com) (205.180.230.5) by sourceware.cygnus.com with SMTP; 15 Nov 2001 18:03:08 -0000 Received: from porcupine.cygnus.com (cse.cygnus.com [205.180.230.236]) by runyon.cygnus.com (8.8.7-cygnus/8.8.7) with ESMTP id KAA28413 for ; Thu, 15 Nov 2001 10:03:04 -0800 (PST) Received: from porcupine.cygnus.com (law@localhost) by porcupine.cygnus.com (8.11.6/8.11.6) with ESMTP id fAFG2Tm01856; Thu, 15 Nov 2001 11:02:29 -0500 X-Mailer: exmh version 2.4 06/23/2000 with nmh-1.0.4 To: drepper@redhat.com Cc: dj@redhat.com, gcc-patches@gcc.gnu.org Reply-to: law@redhat.com From: law@redhat.com Subject: Minor change to regex.c Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Tue, 13 Nov 2001 15:03:00 -0000 Message-ID: <1855.1005840148@porcupine.cygnus.com> X-SW-Source: 2001-11/txt/msg00296.txt.bz2 It wasn't immediately clear from the glibc project web pages where to send glibc patches. So I'm sending two minor patches to you directly. -- As you are probably aware, regex.c from glibc has been imported into libiberty and is used by a number of projects. Some of those projects (gcc and binutils in particular) require that their source be compilable by non-ANSI/ISO compilers. regex.c uses ANSI/ISO concatentation which, of course, breaks those lame compilers. This patch fixes the problem. * regex.c (PREFIX): Provide an alternate definition for non-ANSI/ISO compilers. (ARG_PREFIX): Likewise. Index: regex.c =================================================================== RCS file: /cvs/cvsfiles/devo/libiberty/regex.c,v retrieving revision 1.6 diff -c -3 -p -r1.6 regex.c *** regex.c 2001/11/13 03:52:48 1.6 --- regex.c 2001/11/15 18:00:24 *************** typedef enum *** 612,618 **** # define UCHAR_T unsigned char # define COMPILED_BUFFER_VAR bufp->buffer # define OFFSET_ADDRESS_SIZE 2 ! # define PREFIX(name) byte_##name # define ARG_PREFIX(name) name # define PUT_CHAR(c) putchar (c) #else --- 612,622 ---- # define UCHAR_T unsigned char # define COMPILED_BUFFER_VAR bufp->buffer # define OFFSET_ADDRESS_SIZE 2 ! # if defined __STDC__ && __STDC__ ! # define PREFIX(name) byte_##name ! # else ! # define PREFIX(name) byte_/**/name ! # endif # define ARG_PREFIX(name) name # define PUT_CHAR(c) putchar (c) #else *************** typedef enum *** 622,629 **** # define COMPILED_BUFFER_VAR wc_buffer # define OFFSET_ADDRESS_SIZE 1 /* the size which STORE_NUMBER macro use */ # define CHAR_CLASS_SIZE ((__alignof__(wctype_t)+sizeof(wctype_t))/sizeof(CH AR_T)+1) ! # define PREFIX(name) wcs_##name ! # define ARG_PREFIX(name) c##name /* Should we use wide stream?? */ # define PUT_CHAR(c) printf ("%C", c); # define TRUE 1 --- 626,638 ---- # define COMPILED_BUFFER_VAR wc_buffer # define OFFSET_ADDRESS_SIZE 1 /* the size which STORE_NUMBER macro use */ # define CHAR_CLASS_SIZE ((__alignof__(wctype_t)+sizeof(wctype_t))/sizeof(CH AR_T)+1) ! # if defined __STDC__ && __STDC__ ! # define PREFIX(name) wcs_##name ! # define ARG_PREFIX(name) c##name ! # else ! # define PREFIX(name) wcs_/**/name ! # define ARG_PREFIX(name) c/**/name ! # endif /* Should we use wide stream?? */ # define PUT_CHAR(c) printf ("%C", c); # define TRUE 1