Commita640845

committed

Allow timezone to compile under Unix by blocking 'timezone' conflict with

system headers.Allow system to find timezone database by pasing pkglibdir into thebinary via a define.

1 parente9a028f commita640845Copy full SHA for a640845

File tree

+15

-8

lines changed

+15

-8

lines changed

Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,14 +4,16 @@`
`4`	`4`	`# Makefile for the timezone library`
`5`	`5`
`6`	`6`	`# IDENTIFICATION`
`7`		`-# $PostgreSQL: pgsql/src/timezone/Makefile,v 1.2 2004/04/3004:31:52 momjian Exp $`
	`7`	`+# $PostgreSQL: pgsql/src/timezone/Makefile,v 1.3 2004/04/3014:24:14 momjian Exp $`
`8`	`8`	`#`
`9`	`9`	`#-------------------------------------------------------------------------`
`10`	`10`
`11`		`-subdir = src/tz`
	`11`	`+subdir = src/timezone`
`12`	`12`	`top_builddir = ../..`
`13`	`13`	`include$(top_builddir)/src/Makefile.global`
`14`	`14`
	`15`	`+overrideCPPFLAGS += -DPKGLIBDIR=\"$(pkglibdir)\"`
	`16`	`+`
`15`	`17`	`OBJS= asctime.o difftime.o localtime.o pgtz.o`
`16`	`18`	`ZICOBJS= zic.o ialloc.o scheck.o localtime.o asctime.o pgtz.o`
`17`	`19`
`@@ -25,6 +27,7 @@ SUBSYS.o: $(OBJS)`
`25`	`27`	`$(LD)$(LDREL)$(LDOUT) SUBSYS.o$(OBJS)`
`26`	`28`
`27`	`29`	`zic:$(ZICOBJS)`
	`30`	`+$(CC)$(CFLAGS)$(ZICOBJS)$(LDFLAGS)$(LIBS) -o$@$(X)`
`28`	`31`
`29`	`32`	`install: zic`
`30`	`33`	`zic -d$(datadir)/timezone$(TZDATAFILES)`

Lines changed: 6 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`* Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group`
`7`	`7`	`*`
`8`	`8`	`* IDENTIFICATION`
`9`		`- * $PostgreSQL: pgsql/src/timezone/pgtz.c,v 1.1 2004/04/3004:09:23 momjian Exp $`
	`9`	`+ * $PostgreSQL: pgsql/src/timezone/pgtz.c,v 1.2 2004/04/3014:24:14 momjian Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -15,28 +15,28 @@`
`15`	`15`	`#include"tzfile.h"`
`16`	`16`
`17`	`17`
`18`		`-#ifdefWIN32`
`19`	`18`	`staticchartzdir[MAXPGPATH];`
`20`	`19`	`staticintdone_tzdir=0;`
`21`	`20`	`char*pgwin32_TZDIR(void) {`
`22`	`21`	`char*p;`
`23`	`22`	`if (done_tzdir)`
`24`	`23`	`returntzdir;`
`25`	`24`
	`25`	`+#ifndefWIN32`
	`26`	`+StrNCpy(tzdir,PKGLIBDIR,MAXPGPATH);`
	`27`	`+#else`
`26`	`28`	`if (GetModuleFileName(NULL,tzdir,MAXPGPATH)==0)`
`27`	`29`	`returnNULL;`
	`30`	`+#endif`
`28`	`31`
`29`	`32`	`canonicalize_path(tzdir);`
`30`	`33`	`if ((p=last_path_separator(tzdir))==NULL)`
`31`	`34`	`returnNULL;`
`32`	`35`	`else`
`33`	`36`	`*p='\0';`
`34`	`37`
`35`		`-strcat(tzdir,"/../share/timezone");`
	`38`	`+strcat(tzdir,"/../timezone");`
`36`	`39`
`37`	`40`	`done_tzdir=1;`
`38`	`41`	`returntzdir;`
`39`	`42`	`}`
`40`		`-#else`
`41`		`-#error pgwin32_TZDIR not implemented on non win32 yet!`
`42`		`-#endif`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,11 @@ static charprivatehid[] = "@(#)private.h7.53";`
`88`	`88`	`#include"errno.h"`
`89`	`89`	`#include"string.h"`
`90`	`90`	`#include"limits.h"/* for CHAR_BIT */`
	`91`	`+#define_timezone timezone`
	`92`	`+#undef timezone`
`91`	`93`	`#include"time.h"`
	`94`	`+#definetimezone _timezone`
	`95`	`+#undef _timezone`
`92`	`96`	`#include"stdlib.h"`
`93`	`97`
`94`	`98`	`#ifHAVE_GETTEXT-0`

Comments

(0)