diff options
Diffstat (limited to 'src/backend/utils/init/miscinit.c')
| -rw-r--r-- | src/backend/utils/init/miscinit.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c index a9639d7a74e..f24a8567fa5 100644 --- a/src/backend/utils/init/miscinit.c +++ b/src/backend/utils/init/miscinit.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.3 1996/11/14 10:24:41 bryanh Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.4 1997/02/14 04:18:17 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,10 +18,8 @@ #include <sys/file.h> #include <stdio.h> #include <unistd.h> -#ifndef WIN32 #include <grp.h> /* for getgrgid */ #include <pwd.h> /* for getpwuid */ -#endif /* WIN32 */ #include "postgres.h" @@ -58,9 +56,7 @@ extern char *DatabasePath; * Define USE_ENVIRONMENT to get PGDATA, etc. from environment variables. * This is the default on UNIX platforms. */ -#ifndef WIN32 #define USE_ENVIRONMENT -#endif /* ---------------------------------------------------------------- * some of the 19 ways to leave postgres @@ -294,15 +290,6 @@ SetPgUserName() UserName = malloc(strlen(p)+1); strcpy(UserName, p); #endif /* NO_SECURITY */ - -#ifdef WIN32 - /* XXX We'll figure out how to get the user name later */ - if (UserName) - free(UserName); - UserName = malloc(strlen(p)+1); - strcpy(UserName, "postgres"); -#endif /* WIN32 */ - } /* ---------------------------------------------------------------- |