diff options
| author | Bruce Momjian | 2004-04-30 20:01:39 +0000 |
|---|---|---|
| committer | Bruce Momjian | 2004-04-30 20:01:39 +0000 |
| commit | 04d426ba7065301f65227259209ecc9e5a314551 (patch) | |
| tree | f28e3b1c1b30c50599bca8ad9549dd58dd3ec2ed /src/timezone | |
| parent | 1360fe409654858d77096a7d83b15a550b9b6c85 (diff) | |
Allow build of timezone database on unix.
Diffstat (limited to 'src/timezone')
| -rw-r--r-- | src/timezone/Makefile | 4 | ||||
| -rw-r--r-- | src/timezone/pgtz.h | 1 | ||||
| -rw-r--r-- | src/timezone/private.h | 5 |
3 files changed, 8 insertions, 2 deletions
diff --git a/src/timezone/Makefile b/src/timezone/Makefile index 22639a4e4a..d0e7490d65 100644 --- a/src/timezone/Makefile +++ b/src/timezone/Makefile @@ -4,7 +4,7 @@ # Makefile for the timezone library # IDENTIFICATION -# $PostgreSQL: pgsql/src/timezone/Makefile,v 1.5 2004/04/30 17:52:07 momjian Exp $ +# $PostgreSQL: pgsql/src/timezone/Makefile,v 1.6 2004/04/30 20:01:39 momjian Exp $ # #------------------------------------------------------------------------- @@ -30,7 +30,7 @@ zic: $(ZICOBJS) $(CC) $(CFLAGS) $(ZICOBJS) $(LDFLAGS) $(LIBS) -o $@$(X) install: zic - zic -d $(pkglibdir)/../timezone $(TZDATAFILES) + ./zic -d $(pkglibdir)/../timezone $(TZDATAFILES) clean distclean maintainer-clean: rm -f SUBSYS.o $(OBJS) $(ZICOBJS) diff --git a/src/timezone/pgtz.h b/src/timezone/pgtz.h index 6be10367c4..09205a5ee4 100644 --- a/src/timezone/pgtz.h +++ b/src/timezone/pgtz.h @@ -4,6 +4,7 @@ #define HAVE_SYMLINK 0 #endif + #define NOID #define TZDIR pgwin32_TZDIR() diff --git a/src/timezone/private.h b/src/timezone/private.h index c8f4548683..d71c58b6ac 100644 --- a/src/timezone/private.h +++ b/src/timezone/private.h @@ -88,7 +88,12 @@ static char privatehid[] = "@(#)private.h 7.53"; #include "errno.h" #include "string.h" #include "limits.h" /* for CHAR_BIT */ + +#define save_timezone pg_timezone +#undef timezone #include "time.h" +#define timezone save_timezone + #include "stdlib.h" #if HAVE_GETTEXT - 0 |