Revision: 126948 Author: clattner Date: 2007-05-05 10:57:58 -0700 (Sat, 05 May 2007)
Log Message: ----------- Revert part of the positron merge patch. This is needed to unbreak linux. This should be revisited. Modified Paths: -------------- apple-local/branches/llvm/gcc/gsyslimits.h apple-local/branches/llvm/gcc/limitx.h apple-local/branches/llvm/gcc/limity.h Modified: apple-local/branches/llvm/gcc/gsyslimits.h =================================================================== --- apple-local/branches/llvm/gcc/gsyslimits.h 2007-05-05 04:01:18 UTC (rev 126947) +++ apple-local/branches/llvm/gcc/gsyslimits.h 2007-05-05 17:57:58 UTC (rev 126948) @@ -4,5 +4,5 @@ instead of this text. */ #define _GCC_NEXT_LIMITS_H /* tell gcc's limits.h to recurse */ -/* APPLE LOCAL begin 4401222 */ -/* APPLE LOCAL end 4401222 */ +#include_next <limits.h> +#undef _GCC_NEXT_LIMITS_H Modified: apple-local/branches/llvm/gcc/limitx.h =================================================================== --- apple-local/branches/llvm/gcc/limitx.h 2007-05-05 04:01:18 UTC (rev 126947) +++ apple-local/branches/llvm/gcc/limitx.h 2007-05-05 17:57:58 UTC (rev 126948) @@ -1,13 +1,12 @@ /* This administrivia gets added to the beginning of limits.h if the system has its own version of limits.h. */ -/* APPLE LOCAL begin 4401222 */ +/* We use _GCC_LIMITS_H_ because we want this not to match + any macros that the system's limits.h uses for its own purposes. */ +#ifndef _GCC_LIMITS_H_ /* Terminated in limity.h. */ +#define _GCC_LIMITS_H_ + #ifndef _LIBC_LIMITS_H_ /* Use "..." so that we find syslimits.h only in this same directory. */ #include "syslimits.h" #endif -#ifdef _GCC_NEXT_LIMITS_H -#include_next <limits.h> -#undef _GCC_NEXT_LIMITS_H -#endif -/* APPLE LOCAL end 4401222 */ Modified: apple-local/branches/llvm/gcc/limity.h =================================================================== --- apple-local/branches/llvm/gcc/limity.h 2007-05-05 04:01:18 UTC (rev 126947) +++ apple-local/branches/llvm/gcc/limity.h 2007-05-05 17:57:58 UTC (rev 126948) @@ -1,2 +1,10 @@ -/* APPLE LOCAL begin 4401222 */ -/* APPLE LOCAL end 4401222 */ +/* This administrivia gets added to the end of limits.h + if the system has its own version of limits.h. */ + +#else /* not _GCC_LIMITS_H_ */ + +#ifdef _GCC_NEXT_LIMITS_H +#include_next <limits.h> /* recurse down to the real one */ +#endif + +#endif /* not _GCC_LIMITS_H_ */ _______________________________________________ llvm-commits mailing list llvm-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits