From c9902b6aaa9bfcb9cc245335a1d141d9c1ce46d7 Mon Sep 17 00:00:00 2001 From: "Jordan K. Hubbard" Date: Sun, 13 Nov 1994 06:11:02 +0000 Subject: [PATCH] Fix merge conflicts. --- gnu/lib/libg++/Makefile | 15 ++++++++------- gnu/lib/libg++/include/_G_config.h | 20 +++++++++----------- 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/gnu/lib/libg++/Makefile b/gnu/lib/libg++/Makefile index 7a7888a7839..007dc4ca00e 100644 --- a/gnu/lib/libg++/Makefile +++ b/gnu/lib/libg++/Makefile @@ -1,16 +1,17 @@ # -# $Id: Makefile,v 1.4 1994/09/10 07:15:59 pst Exp $ +# $FreeBSD$ # -SRCS= vasprintf.c strerror.c strsignal.c -SRCS+= filedoalloc.c floatconv.c genops.c fileops.c iovfprintf.c iovfscanf.c ioignore.c iopadn.c iofgetpos.c iofread.c iofscanf.c iofsetpos.c iogetline.c ioprintf.c ioseekoff.c ioseekpos.c outfloat.c strops.c iofclose.c iopopen.c ioungetc.c builtinbuf.cc filebuf.cc fstream.cc indstream.cc isgetline.cc isgetsb.cc isscan.cc ioextend.cc iomanip.cc iostream.cc osform.cc procbuf.cc sbform.cc sbgetline.cc sbscan.cc stdiostream.cc stdstrbufs.cc stdstreams.cc stream.cc streambuf.cc strstream.cc PlotFile.cc SFile.cc parsestream.cc pfstream.cc editbuf.cc ioprims.c iostrerror.c cleanup.c -SRCS+= AllocRing.cc Obstack.cc builtin.cc regex.cc Regex.cc String.cc Intdouble.cc Integer.cc Rational.cc Complex.cc Random.cc BitSet.cc BitString.cc LogNorm.cc SmplHist.cc SmplStat.cc Normal.cc NegExp.cc Weibull.cc Erlang.cc DiscUnif.cc Uniform.cc Poisson.cc HypGeom.cc Geom.cc Binomial.cc RNG.cc ACG.cc MLCG.cc RndInt.cc Fix.cc Fix16.cc Fix24.cc CursesW.cc GetOpt.cc new.cc chr.cc error.cc gcd.cc hash.cc lg.cc fmtq.cc ioob.cc pow.cc sqrt.cc str.cc timer.c math.cc compare.cc bitand.c bitany.c bitblt.c bitclear.c bitcopy.c bitcount.c bitinvert.c bitlcomp.c bitset1.c bitxor.c SLList.cc DLList.cc +SRCS= strerror.c strsignal.c +SRCS+= filedoalloc.c floatconv.c genops.c fileops.c iovfprintf.c iovfscanf.c ioignore.c iopadn.c iofgetpos.c iofread.c iofscanf.c iofsetpos.c iogetdelim.c iogetline.c ioprintf.c ioseekoff.c ioseekpos.c outfloat.c strops.c iofclose.c iopopen.c ioungetc.c builtinbuf.cc filebuf.cc fstream.cc indstream.cc ioassign.cc ioextend.cc iomanip.cc iostream.cc isgetline.cc isgetsb.cc isscan.cc osform.cc procbuf.cc sbform.cc sbgetline.cc sbscan.cc stdiostream.cc stdstrbufs.cc stdstreams.cc stream.cc streambuf.cc strstream.cc PlotFile.cc SFile.cc parsestream.cc pfstream.cc editbuf.cc ioprims.c iostrerror.c cleanup.c +SRCS+= AllocRing.cc Obstack.cc builtin.cc Regex.cc String.cc Intdouble.cc Integer.cc Rational.cc Complex.cc Random.cc BitSet.cc BitString.cc LogNorm.cc SmplHist.cc SmplStat.cc Normal.cc NegExp.cc Weibull.cc Erlang.cc DiscUnif.cc Uniform.cc Poisson.cc HypGeom.cc Geom.cc Binomial.cc RNG.cc ACG.cc MLCG.cc RndInt.cc Fix.cc Fix16.cc Fix24.cc CursesW.cc GetOpt.cc except.c new.cc chr.cc error.cc gcd.cc hash.cc lg.cc fmtq.cc ioob.cc pow.cc sqrt.cc str.cc timer.c math.cc compare.cc bitand.c bitany.c bitblt.c bitclear.c bitcopy.c bitcount.c bitinvert.c bitlcomp.c bitset1.c bitxor.c SLList.cc DLList.cc +SRCS+= rx.c LIB= g++ NOMAN= noman CFLAGS+= -nostdinc -I${.CURDIR}/include -I/usr/include -CXXFLAGS+= -fexternal-templates -I${.CURDIR}/include -.PATH: ${.CURDIR}/libiberty ${.CURDIR}/libio ${.CURDIR}/libg++ -LDADD+= -lcurses +CXXFLAGS+= -I${.CURDIR}/include -I/usr/include/g++ -I/usr/include -nostdinc++ +LDADD+= -lcurses +.PATH: ${.CURDIR}/libiberty ${.CURDIR}/libio ${.CURDIR}/libg++ ${.CURDIR}/librx beforeinstall: @-if [ ! -d ${DESTDIR}/usr/include/g++ ]; then mkdir ${DESTDIR}/usr/include/g++; chown ${BINOWN}.${BINGRP} ${DESTDIR}/usr/include/g++; chmod 755 ${DESTDIR}/usr/include/g++; fi diff --git a/gnu/lib/libg++/include/_G_config.h b/gnu/lib/libg++/include/_G_config.h index 01a17879510..1e5e28dfd6a 100644 --- a/gnu/lib/libg++/include/_G_config.h +++ b/gnu/lib/libg++/include/_G_config.h @@ -1,15 +1,10 @@ /* AUTOMATICALLY GENERATED; DO NOT EDIT! */ -#ifndef _G_config_h -/* - * XXX This #include added by hand, it SHOULD NOT be here, but we do - * not currently have the tools that Automatically generate this file and must - * resort to this hackery to make it compile under FreeBSD 2.X - */ #include +#ifndef _G_config_h #define _G_config_h -#define _G_LIB_VERSION "0.65" +#define _G_LIB_VERSION "0.66" #define _G_NAMES_HAVE_UNDERSCORE 1 -#define _G_VTABLE_LABEL_HAS_LENGTH 0 +#define _G_VTABLE_LABEL_HAS_LENGTH 1 #define _G_VTABLE_LABEL_PREFIX "__vt$" #define _G_HAVE_ST_BLKSIZE 1 typedef unsigned long _G_clock_t; @@ -37,7 +32,7 @@ typedef unsigned long _G_uid_t; #endif typedef __WCHAR_TYPE__ _G_wchar_t; typedef int _G_ssize_t; -typedef int _G_wint_t; +typedef int /* default */ _G_wint_t; typedef char* /* default */ _G_va_list; #define _G_signal_return_type void #define _G_sprintf_return_type int @@ -61,9 +56,12 @@ typedef unsigned _G_uint64_t; #else #define _G_ARGS(ARGLIST) () #endif -#if defined (__GNUG__) && defined (__STRICT_ANSI__) +#if !defined (__GNUG__) || defined (__STRICT_ANSI__) #define _G_NO_NRV #endif +#if !defined (__GNUG__) +#define _G_NO_EXTERN_TEMPLATES +#endif #define _G_HAVE_ATEXIT 1 #define _G_HAVE_SYS_RESOURCE 0 #define _G_HAVE_SYS_SOCKET 1 @@ -72,5 +70,5 @@ typedef unsigned _G_uint64_t; #define _G_HAVE_DIRENT 1 #define _G_HAVE_CURSES 1 #define _G_MATH_H_INLINES 0 -#define _G_HAVE_BOOL 0 +#define _G_HAVE_BOOL 1 #endif /* !_G_config_h */