[llvm-branch-commits] [llvm-gcc-branch] r155408 - /llvm-gcc-4.2/branches/Apple/Morbo/fixincludes/fixincl.x

[Bob Wilson]

Author: bwilson
Date: Mon Apr 23 18:30:45 2012
New Revision: 155408

URL: http://llvm.org/viewvc/llvm-project?rev=155408&view=rev
Log:
Skip the math_exception fix-include if already guarded for C++. rdar://11147812

The current OS X version of math.h already guards the relevant part of math.h
with a preprocessor check for __cplusplus, so there's no need to generate a
fixed version.

Modified:
    llvm-gcc-4.2/branches/Apple/Morbo/fixincludes/fixincl.x

Modified: llvm-gcc-4.2/branches/Apple/Morbo/fixincludes/fixincl.x
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Morbo/fixincludes/fixincl.x?rev=155408&r1=155407&r2=155408&view=diff
==============================================================================
--- llvm-gcc-4.2/branches/Apple/Morbo/fixincludes/fixincl.x (original)
+++ llvm-gcc-4.2/branches/Apple/Morbo/fixincludes/fixincl.x Mon Apr 23 18:30:45 2012
@@ -4652,10 +4652,13 @@
  */
 tSCC zMath_ExceptionBypass0[] =
        "We have a problem when using C\\+\\+|for C\\+\\+, _[a-z0-9A-Z_]+_exception; for C, exception";
+tSCC zMath_ExceptionBypass1[] =
+       "defined __cplusplus";
 
 #define    MATH_EXCEPTION_TEST_CT  2
 static tTestDesc aMath_ExceptionTests[] = {
   { TT_NEGREP,   zMath_ExceptionBypass0, (regex_t*)NULL },
+  { TT_NEGREP,   zMath_ExceptionBypass1, (regex_t*)NULL },
   { TT_EGREP,    zMath_ExceptionSelect0, (regex_t*)NULL }, };
 
 /*