system.h (const, inline): Move the stage2 handling of these keywords-as-macros from here...

* system.h (const, inline): Move the stage2 handling of these
        keywords-as-macros from here...
        * gansidecl.h (const, inline): ...to here.
(This became necessary after using `const' in config directory headers,
which get included before system.h does.  If we're going to reset these
keywords, we must do so before absolutely any other header file.)

From-SVN: r25626
This commit is contained in:
Kaveh R. Ghazi 1999-03-07 05:21:41 +00:00 committed by Kaveh Ghazi
parent b26caacda9
commit 366453bf4b
3 changed files with 20 additions and 12 deletions

View File

@ -1,3 +1,10 @@
Sun Mar 7 08:05:27 1999 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
* system.h (const, inline): Move the stage2 handling of these
keywords-as-macros from here...
* gansidecl.h (const, inline): ...to here.
Sun Mar 7 02:44:15 1999 Richard Henderson <rth@cygnus.com>
* recog.c (push_operand, pop_operand): VOIDmode needn't match modes.

View File

@ -34,6 +34,19 @@ Boston, MA 02111-1307, USA. */
#define VPROTO(ARGS) VPARAMS(ARGS)
#define PVPROTO(ARGS) PARAMS(ARGS)
/* Autoconf will possibly define the `inline' or `const' keywords as
macros, however this is only valid for the stage1 compiler. If we
detect a modern version of gcc, unconditionally reset the values.
This makes sure the right thing happens in stage2 and later. We
need to do this very early; i.e. before any systems header files or
gcc header files in case they use these keywords. Otherwise
conflicts might occur. */
#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)
# undef const
# undef inline
# define inline __inline__ /* Modern gcc can use `__inline__' freely. */
#endif /* GCC >= 2.7 */
#if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7)
# define __attribute__(x)
#endif

View File

@ -22,18 +22,6 @@ Boston, MA 02111-1307, USA. */
#ifndef __GCC_SYSTEM_H__
#define __GCC_SYSTEM_H__
/* Autoconf will possibly define the `inline' or `const' keywords as
macros, however this is only valid for the stage1 compiler. If we
detect a modern version of gcc, unconditionally reset the values.
This makes sure the right thing happens in stage2 and later. We
need to do this before any header files in case they use these
keywords or conflicts might occur. */
#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)
# undef const
# undef inline
# define inline __inline__ /* Modern gcc can use `__inline__' freely. */
#endif /* GCC >= 2.7 */
/* We must include stdarg.h/varargs.h before stdio.h. */
#ifdef ANSI_PROTOTYPES
#include <stdarg.h>