From 0a2b9f9cdeb4696755578d80f0cbbc12455a27b9 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Sat, 1 May 2004 01:34:47 +0000
Subject: [PATCH] Rename function to be less win32 specific.

---
 src/timezone/pgtz.c | 26 ++++++++++++++++----------
 src/timezone/pgtz.h |  4 ++--
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/timezone/pgtz.c b/src/timezone/pgtz.c
index efa9b4119e..0ce7d80e41 100644
--- a/src/timezone/pgtz.c
+++ b/src/timezone/pgtz.c
@@ -1,12 +1,12 @@
 /*-------------------------------------------------------------------------
  *
  * pgtz.c
- *    Timezone Library Integration Functions
+ *	  Timezone Library Integration Functions
  *
  * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/timezone/pgtz.c,v 1.3 2004/04/30 20:23:28 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/timezone/pgtz.c,v 1.4 2004/05/01 01:34:47 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,27 +16,33 @@
 
 
 static char tzdir[MAXPGPATH];
-static int done_tzdir = 0;
-char *pgwin32_TZDIR(void) {
-	char *p;
+static int	done_tzdir = 0;
+char *
+pg_TZDIR(void)
+{
+	char	   *p;
+
 	if (done_tzdir)
 		return tzdir;
 
 #ifndef WIN32
 	StrNCpy(tzdir, PGDATADIR, MAXPGPATH);
 #else
-	if (GetModuleFileName(NULL,tzdir,MAXPGPATH) == 0)
+	if (GetModuleFileName(NULL, tzdir, MAXPGPATH) == 0)
 		return NULL;
 #endif
-	
+
 	canonicalize_path(tzdir);
+#if 0
 	if ((p = last_path_separator(tzdir)) == NULL)
 		return NULL;
 	else
 		*p = '\0';
-	
-	strcat(tzdir,"/timezone");
+#endif
 
-	done_tzdir=1;
+	strcat(tzdir, "/timezone");
+	puts(tzdir);
+
+	done_tzdir = 1;
 	return tzdir;
 }
diff --git a/src/timezone/pgtz.h b/src/timezone/pgtz.h
index 09205a5ee4..8d3daee94f 100644
--- a/src/timezone/pgtz.h
+++ b/src/timezone/pgtz.h
@@ -6,6 +6,6 @@
 
 
 #define NOID
-#define TZDIR pgwin32_TZDIR()
+#define TZDIR pg_TZDIR()
 
-char *pgwin32_TZDIR(void);
+char	   *pg_TZDIR(void);