Make more robust in two places.

[gcc.git] / gcc / limitx.h

diff --git a/gcc/limitx.h b/gcc/limitx.h
index d261e94a7a966e16942ba9e062c632090e2f2454..4e383bcb1f0ecb523f784a1835e2ae8f351ca840 100644 (file)
--- a/gcc/limitx.h
+++ b/gcc/limitx.h
@@ -1,5 +1,12 @@
 /* This administrivia gets added to the beginning of limits.h
    if the system has its own version of limits.h.  */
 
-#include_next <limits.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.  */
+#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 system include dirs.  */
+#include <syslimits.h>
+#endif