summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBruce Momjian2004-08-08 05:19:44 +0000
committerBruce Momjian2004-08-08 05:19:44 +0000
commit8120ff636b63633f1a322c044877028d615d5d50 (patch)
treeda3e767924a5a00cd675daa7f7ea2676a48ad071 /src
parente81cbc21fc663ca381dc4eccb54a74581b39a508 (diff)
More Win32 zic build cleanups now that we have symlinks, it needs help.
Diffstat (limited to 'src')
-rw-r--r--src/timezone/Makefile6
-rw-r--r--src/timezone/zic.c3
2 files changed, 4 insertions, 5 deletions
diff --git a/src/timezone/Makefile b/src/timezone/Makefile
index 5dcf2d0acc..f9386cd12b 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.14 2004/08/08 04:53:41 momjian Exp $
+# $PostgreSQL: pgsql/src/timezone/Makefile,v 1.15 2004/08/08 05:19:44 momjian Exp $
#
#-------------------------------------------------------------------------
@@ -15,10 +15,10 @@ include $(top_builddir)/src/Makefile.global
override CPPFLAGS := -DFRONTEND $(CPPFLAGS)
# files to build into backend
-OBJS= localtime.o strftime.o pgtz.o dirmod.o
+OBJS= localtime.o strftime.o pgtz.o
# files needed to build zic utility program
-ZICOBJS= zic.o ialloc.o scheck.o localtime.o
+ZICOBJS= zic.o ialloc.o scheck.o localtime.o dirmod.o
# timezone data files
TZDATA := africa antarctica asia australasia europe northamerica southamerica \
diff --git a/src/timezone/zic.c b/src/timezone/zic.c
index ac52a43fec..38fc452437 100644
--- a/src/timezone/zic.c
+++ b/src/timezone/zic.c
@@ -3,7 +3,7 @@
* 1996-06-05 by Arthur David Olson (arthur_david_olson@nih.gov).
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/timezone/zic.c,v 1.9 2004/07/22 01:41:24 tgl Exp $
+ * $PostgreSQL: pgsql/src/timezone/zic.c,v 1.10 2004/08/08 05:19:44 momjian Exp $
*/
#include "postgres.h"
@@ -19,7 +19,6 @@
#include "tzfile.h"
#ifdef WIN32
-#undef unlink
#include <windows.h>
#endif