diff options
| -rw-r--r-- | src/interfaces/libpq/fe-connect.c | 6 | ||||
| -rw-r--r-- | src/interfaces/libpq/libpq-fe.h | 4 | ||||
| -rw-r--r-- | src/interfaces/libpq/win32.mak | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c index 5d244fa838f..4add3529dd5 100644 --- a/src/interfaces/libpq/fe-connect.c +++ b/src/interfaces/libpq/fe-connect.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.81 1998/09/03 02:10:46 momjian Exp $ + * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.82 1998/09/18 16:46:05 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -1290,9 +1290,9 @@ conninfo_parse(const char *conninfo, char *errorMessage) * Try to get the environment variable fallback * ---------- */ - if (option->environ != NULL) + if (option->envvar != NULL) { - if ((tmp = getenv(option->environ)) != NULL) + if ((tmp = getenv(option->envvar)) != NULL) { option->val = strdup(tmp); continue; diff --git a/src/interfaces/libpq/libpq-fe.h b/src/interfaces/libpq/libpq-fe.h index d7a0386002e..8f090352635 100644 --- a/src/interfaces/libpq/libpq-fe.h +++ b/src/interfaces/libpq/libpq-fe.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: libpq-fe.h,v 1.42 1998/09/04 05:03:05 momjian Exp $ + * $Id: libpq-fe.h,v 1.43 1998/09/18 16:46:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -112,7 +112,7 @@ typedef void (*PQnoticeProcessor) (void * arg, const char * message); typedef struct _PQconninfoOption { char *keyword; /* The keyword of the option */ - char *environ; /* Fallback environment variable name */ + char *envvar; /* Fallback environment variable name */ char *compiled; /* Fallback compiled in default value */ char *val; /* Options value */ char *label; /* Label for field in connect dialog */ diff --git a/src/interfaces/libpq/win32.mak b/src/interfaces/libpq/win32.mak index 41d28189dcd..71d57dc4643 100644 --- a/src/interfaces/libpq/win32.mak +++ b/src/interfaces/libpq/win32.mak @@ -33,7 +33,7 @@ CLEAN : -@erase "$(OUTDIR)\libpq.lib" -@erase "$(OUTDIR)\libpq.dll" -@erase "$(OUTDIR)\libpq.res" - -@erase "vc50.pch" + -@erase "$(OUTDIR)\vc*.*" -@erase "$(OUTDIR)\libpq.pch" -@erase "$(OUTDIR)\libpqdll.exp" -@erase "$(OUTDIR)\libpqdll.lib" |