diff options
| author | Marc G. Fournier <scrappy@hub.org> | 1997-12-19 02:09:10 +0000 |
|---|---|---|
| committer | Marc G. Fournier <scrappy@hub.org> | 1997-12-19 02:09:10 +0000 |
| commit | 5379b84eff3ae207635d7ac9527b0a3f5eb272e7 (patch) | |
| tree | 84d6a71200ffe5edf43596bc2fbf3276737e086a /src/backend/utils/adt | |
| parent | 30856a390457682db4f8577e9f5a7f8521839c6f (diff) | |
More cleanups. I can now compile without PORTNAME being defined n
Makefile.global.
End result, if all goes well, should allow for much easier porting, since
there will no longer be a concept of a "port". Most, if not everything,
*should* be determined by configure, or by the compiler itself. Still
work to be done though :)
Diffstat (limited to 'src/backend/utils/adt')
| -rw-r--r-- | src/backend/utils/adt/Makefile | 10 | ||||
| -rw-r--r-- | src/backend/utils/adt/misc.c | 6 | ||||
| -rw-r--r-- | src/backend/utils/adt/numutils.c | 9 |
3 files changed, 16 insertions, 9 deletions
diff --git a/src/backend/utils/adt/Makefile b/src/backend/utils/adt/Makefile index 2d356848f97..fe5b76f5b4e 100644 --- a/src/backend/utils/adt/Makefile +++ b/src/backend/utils/adt/Makefile @@ -4,16 +4,18 @@ # Makefile for utils/adt # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/utils/adt/Makefile,v 1.8 1997/04/09 08:36:04 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/utils/adt/Makefile,v 1.9 1997/12/19 02:07:55 scrappy Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../.. \ - -I../../port/$(PORTNAME) \ - -I../../../include +INCLUDE_OPT = -I../.. + +ifdef PORTNAME +INCLUDE+=-I../../port/$(PORTNAME) +endif CFLAGS+=$(INCLUDE_OPT) diff --git a/src/backend/utils/adt/misc.c b/src/backend/utils/adt/misc.c index 06bc79374f9..d652b048999 100644 --- a/src/backend/utils/adt/misc.c +++ b/src/backend/utils/adt/misc.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/misc.c,v 1.10 1997/09/08 21:48:31 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/misc.c,v 1.11 1997/12/19 02:07:59 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -18,7 +18,9 @@ #include "catalog/pg_type.h" #include "utils/builtins.h" -#include "port-protos.h" /* For random(), sometimes */ +#ifndef HAVE_RANDOM +# include "port-protos.h" /* For random(), sometimes */ +#endif /*------------------------------------------------------------------------- diff --git a/src/backend/utils/adt/numutils.c b/src/backend/utils/adt/numutils.c index 07bb1b6fda0..6aae6b36147 100644 --- a/src/backend/utils/adt/numutils.c +++ b/src/backend/utils/adt/numutils.c @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.17 1997/11/17 16:26:27 thomas Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.18 1997/12/19 02:08:01 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -27,7 +27,10 @@ #else #include <string.h> #endif -#include <port-protos.h> /* ecvt(), fcvt() */ + +#ifndef HAVE_FCVT +# include <port-protos.h> /* ecvt(), fcvt() */ +#endif #ifndef INT_MAX #define INT_MAX (0x7FFFFFFFL) @@ -334,7 +337,7 @@ frac_out: *a = 0; avail = a - ascii; return (avail); -#endif /* !BSD44_derived */ +#endif } #endif |