From 7673b71ce98231709cd068e8ad2c9a3875d34d85 Mon Sep 17 00:00:00 2001 From: Bruce Korb Date: Fri, 6 May 2005 16:33:18 +0000 Subject: [PATCH] Fix backslash expression in here string [[Split portion of a mixed commit.]] Co-Authored-By: Joseph Myers From-SVN: r99322.2 --- fixincludes/ChangeLog | 6 ++++++ fixincludes/fixincl.x | 18 +++++++++--------- fixincludes/inclhack.def | 14 +++++++------- 3 files changed, 22 insertions(+), 16 deletions(-) diff --git a/fixincludes/ChangeLog b/fixincludes/ChangeLog index 36300e433df..d471581ca8d 100644 --- a/fixincludes/ChangeLog +++ b/fixincludes/ChangeLog @@ -1,3 +1,9 @@ +2005-05-06 Bruce Korb + Joseph S. Myers + + * fixinc/inclhack.def: Correct backslashes + * fixinc/fixincl.x: regen + 2005-04-19 Kaveh R. Ghazi * system.h (fopen, fdopen, freopen): Define these to the unlocked diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x index 7d6979d5643..23e30eb2a5e 100644 --- a/fixincludes/fixincl.x +++ b/fixincludes/fixincl.x @@ -2,11 +2,11 @@ * * DO NOT EDIT THIS FILE (fixincl.x) * - * It has been AutoGen-ed Monday March 21, 2005 at 05:22:01 PM CET + * It has been AutoGen-ed Friday May 6, 2005 at 09:31:52 AM PDT * From the definitions inclhack.def * and the template file fixincl */ -/* DO NOT CVS-MERGE THIS FILE, EITHER Mon Mar 21 17:22:01 CET 2005 +/* DO NOT CVS-MERGE THIS FILE, EITHER Fri May 6 09:31:52 PDT 2005 * * You must regenerate it. Use the ./genfixes script. * @@ -124,13 +124,13 @@ static const char* apzAab_Fd_Zero_Gnu_Types_HPatch[] = { #include_next \n\n\ #if defined(__FD_ZERO) && !defined(__GLIBC__)\n\ #undef __FD_ZERO\n\ -# define __FD_ZERO(fdsetp) \\\\\n\ - do { \\\\\n\ - int __d0, __d1; \\\\\n\ -__asm__ __volatile__(\"cld ; rep ; stosl\" \\\\\n\ - \t: \"=&c\" (__d0), \"=&D\" (__d1) \\\\\n\ - \t: \"a\" (0), \"0\" (__FDSET_LONGS), \\\\\n\ - \"1\" ((__fd_set *) (fdsetp)) :\"memory\"); \\\\\n\ +# define __FD_ZERO(fdsetp) \\\n\ + do { \\\n\ + int __d0, __d1; \\\n\ + __asm__ __volatile__(\"cld ; rep ; stosl\" \\\n\ + : \"=&c\" (__d0), \"=&D\" (__d1) \\\n\ + : \"a\" (0), \"0\" (__FDSET_LONGS), \\\n\ + \"1\" ((__fd_set *) (fdsetp)) :\"memory\"); \\\n\ } while (0)\n\ #endif\n\n\ #define _TYPES_H_WRAPPER\n\ diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def index f55a9f05a05..3adf4711d67 100644 --- a/fixincludes/inclhack.def +++ b/fixincludes/inclhack.def @@ -82,13 +82,13 @@ fix = { #if defined(__FD_ZERO) && !defined(__GLIBC__) #undef __FD_ZERO - # define __FD_ZERO(fdsetp) \\ - do { \\ - int __d0, __d1; \\ - __asm__ __volatile__("cld ; rep ; stosl" \\ - : "=&c" (__d0), "=&D" (__d1) \\ - : "a" (0), "0" (__FDSET_LONGS), \\ - "1" ((__fd_set *) (fdsetp)) :"memory"); \\ + # define __FD_ZERO(fdsetp) \ + do { \ + int __d0, __d1; \ + __asm__ __volatile__("cld ; rep ; stosl" \ + : "=&c" (__d0), "=&D" (__d1) \ + : "a" (0), "0" (__FDSET_LONGS), \ + "1" ((__fd_set *) (fdsetp)) :"memory"); \ } while (0) #endif