cpplib.h (HOST_WIDE_INT): Get definition from "machmode.h" and don't try to define it here.

�
	* cpplib.h (HOST_WIDE_INT): Get definition from "machmode.h"
	and don't try to define it here.
	* Makefile.in (cppmain.o): Depend on machmode.h.
	(cpplib.o): Likewise.
	(cpperror.o): Likewise.
	(cppexp.o): Likewise.
	(cppfiles.o): Likewise.
	(cpphash.o): Likewise.
	(cppalloc.o): Likewise.
	(fix-header.o): Likewise.
	(scan-decls.o): Likewise.

From-SVN: r24260
This commit is contained in:
Manfred Hollstein 1998-12-11 08:27:07 +00:00
parent 56adfa4a5d
commit 5e36733735
2 changed files with 10 additions and 25 deletions

View File

@ -1906,9 +1906,9 @@ cppmain$(exeext): cppmain.o libcpp.a $(LIBDEPS)
$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o cppmain$(exeext) cppmain.o \
libcpp.a $(LIBS)
cppmain.o: cppmain.c $(CONFIG_H) cpplib.h system.h
cppmain.o: cppmain.c $(CONFIG_H) cpplib.h machmode.h system.h
cpplib.o: cpplib.c $(CONFIG_H) cpplib.h cpphash.h config.status system.h
cpplib.o: cpplib.c $(CONFIG_H) cpplib.h machmode.h cpphash.h config.status system.h
$(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
-DGCC_INCLUDE_DIR=\"$(libsubdir)/include\" \
-DGPLUSPLUS_INCLUDE_DIR=\"$(gxx_include_dir)\" \
@ -1917,15 +1917,15 @@ cpplib.o: cpplib.c $(CONFIG_H) cpplib.h cpphash.h config.status system.h
-DTOOL_INCLUDE_DIR=\"$(tooldir)/include\" \
-c `echo $(srcdir)/cpplib.c | sed 's,^\./,,'`
cpperror.o: cpperror.c $(CONFIG_H) cpplib.h system.h
cpperror.o: cpperror.c $(CONFIG_H) cpplib.h machmode.h system.h
cppexp.o: cppexp.c $(CONFIG_H) cpplib.h system.h
cppexp.o: cppexp.c $(CONFIG_H) cpplib.h machmode.h system.h
cppfiles.o: cppfiles.c $(CONFIG_H) cpplib.h system.h
cppfiles.o: cppfiles.c $(CONFIG_H) cpplib.h machmode.h system.h
cpphash.o: cpphash.c cpplib.h cpphash.h $(CONFIG_H) system.h
cpphash.o: cpphash.c cpplib.h machmode.h cpphash.h $(CONFIG_H) system.h
cppalloc.o: cppalloc.c $(CONFIG_H) cpplib.h system.h
cppalloc.o: cppalloc.c $(CONFIG_H) cpplib.h machmode.h system.h
# Note for the stamp targets, we run the program `true' instead of
# having an empty command (nothing following the semicolon).
@ -2142,10 +2142,10 @@ fix-header: fix-header.o scan-decls.o scan.o xsys-protos.h $(HOST_LIBDEPS) \
scan-decls.o scan.o libcpp.a $(HOST_LIBS)
fix-header.o: fix-header.c $(srcdir)/../include/obstack.h scan.h \
xsys-protos.h $(build_xm_file) system.h cpplib.h cpphash.h
xsys-protos.h $(build_xm_file) system.h cpplib.h machmode.h cpphash.h
$(HOST_CC) -c $(HOST_CFLAGS) $(HOST_CPPFLAGS) $(INCLUDES) $(srcdir)/fix-header.c
scan-decls.o: scan-decls.c scan.h cpplib.h $(build_xm_file) system.h
scan-decls.o: scan-decls.c scan.h cpplib.h machmode.h $(build_xm_file) system.h
$(HOST_CC) -c $(HOST_CFLAGS) $(HOST_CPPFLAGS) $(INCLUDES) $(srcdir)/scan-decls.c
# stmp-fixproto depends on this, not on fix-header directly.

View File

@ -668,22 +668,7 @@ typedef struct if_stack IF_STACK_FRAME;
Watch out: on some crazy hosts `long' is shorter than `int'. */
#ifndef HOST_WIDE_INT
# if HAVE_INTTYPES_H
# include <inttypes.h>
# define HOST_WIDE_INT intmax_t
# else
# if (HOST_BITS_PER_LONG <= HOST_BITS_PER_INT \
&& HOST_BITS_PER_LONGLONG <= HOST_BITS_PER_INT)
# define HOST_WIDE_INT int
# else
# if (HOST_BITS_PER_LONGLONG <= HOST_BITS_PER_LONG \
|| ! (defined LONG_LONG_MAX || defined LLONG_MAX))
# define HOST_WIDE_INT long
# else
# define HOST_WIDE_INT long long
# endif
# endif
# endif
#include "machmode.h"
#endif
extern void cpp_buf_line_and_col PARAMS((cpp_buffer *, long *, long *));