database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-25 01:02:05 +03:00
Code Activity

Fixes for VC and libpq.

Browse Source 
Magnus Hagander
This commit is contained in:
Bruce Momjian
1998-09-18 16:46:07 +00:00
parent 33554989c0
commit 1202ab259a
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/interfaces/libpq/fe-connect.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * 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 * 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); option->val = strdup(tmp);
continue; continue;

4
src/interfaces/libpq/libpq-fe.h
View File

@ -6,7 +6,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * 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 typedef struct _PQconninfoOption
{ {
char *keyword; /* The keyword of the option */ 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 *compiled; /* Fallback compiled in default value */
char *val; /* Options value */ char *val; /* Options value */
char *label; /* Label for field in connect dialog */ char *label; /* Label for field in connect dialog */

2
src/interfaces/libpq/win32.mak
View File

@ -33,7 +33,7 @@ CLEAN :
-@erase "$(OUTDIR)\libpq.lib" -@erase "$(OUTDIR)\libpq.lib"
-@erase "$(OUTDIR)\libpq.dll" -@erase "$(OUTDIR)\libpq.dll"
-@erase "$(OUTDIR)\libpq.res" -@erase "$(OUTDIR)\libpq.res"
-@erase "vc50.pch" -@erase "$(OUTDIR)\vc*.*"
-@erase "$(OUTDIR)\libpq.pch" -@erase "$(OUTDIR)\libpq.pch"
-@erase "$(OUTDIR)\libpqdll.exp" -@erase "$(OUTDIR)\libpqdll.exp"
-@erase "$(OUTDIR)\libpqdll.lib" -@erase "$(OUTDIR)\libpqdll.lib"