[llvm-commits] [llvm-gcc-4.2] r54479 - in /llvm-gcc-4.2/trunk/gcc: gsyslimits.h limitx.h limity.h

[Bill Wendling]

Author: void
Date: Thu Aug  7 13:14:25 2008
New Revision: 54479

URL: http://llvm.org/viewvc/llvm-project?rev=54479&view=rev
Log:
Revert r54245. Matthijs did a check and verified that this ugly hack isn't
needed anymore.

Modified:
    llvm-gcc-4.2/trunk/gcc/gsyslimits.h
    llvm-gcc-4.2/trunk/gcc/limitx.h
    llvm-gcc-4.2/trunk/gcc/limity.h

Modified: llvm-gcc-4.2/trunk/gcc/gsyslimits.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/gsyslimits.h?rev=54479&r1=54478&r2=54479&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/gsyslimits.h (original)
+++ llvm-gcc-4.2/trunk/gcc/gsyslimits.h Thu Aug  7 13:14:25 2008
@@ -5,10 +5,4 @@
 
 #define _GCC_NEXT_LIMITS_H		/* tell gcc's limits.h to recurse */
 /* APPLE LOCAL begin 4401222 */
-/* LLVM LOCAL */
-#ifndef CONFIG_DARWIN_H
-#include_next <limits.h>
-#undef _GCC_NEXT_LIMITS_H
-/* LLVM LOCAL */
-#endif /* not CONFIG_DARWIN_H */
 /* APPLE LOCAL end 4401222 */

Modified: llvm-gcc-4.2/trunk/gcc/limitx.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/limitx.h?rev=54479&r1=54478&r2=54479&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/limitx.h (original)
+++ llvm-gcc-4.2/trunk/gcc/limitx.h Thu Aug  7 13:14:25 2008
@@ -2,27 +2,6 @@
    if the system has its own version of limits.h.  */
 
 /* APPLE LOCAL begin 4401222 */
-/* LLVM LOCAL */
-#ifdef CONFIG_DARWIN_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
-
-/* LLVM LOCAL begin */
-#endif /* not CONFIG_DARWIN_H */
-
-/* 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.  */
-/* LLVM LOCAL */
-#if !defined(_GCC_LIMITS_H_) && !defined(CONFIG_DARWIN_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"
@@ -31,5 +10,4 @@
 #include_next <limits.h>
 #undef _GCC_NEXT_LIMITS_H
 #endif
-/* LLVM LOCAL end */
 /* APPLE LOCAL end 4401222 */

Modified: llvm-gcc-4.2/trunk/gcc/limity.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/limity.h?rev=54479&r1=54478&r2=54479&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/limity.h (original)
+++ llvm-gcc-4.2/trunk/gcc/limity.h Thu Aug  7 13:14:25 2008
@@ -1,19 +1,2 @@
 /* APPLE LOCAL begin 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_ */
-
-/* LLVM LOCAL */
-#ifndef CONFIG_DARWIN_H
-
-#ifdef _GCC_NEXT_LIMITS_H
-#include_next <limits.h>/* recurse down to the real one */
-#endif
-
-/* LLVM LOCAL */
-#endif /* not CONFIG_DARWIN_H */
-
-#endif /* not _GCC_LIMITS_H_ */
 /* APPLE LOCAL end 4401222 */