Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 4142769

Browse files
committed
There are two problems when compiling libpq.dll and psql.exe
on Windows. I'm not sure it is the best way to fix them (see patch below.) Mikhail Terekhov with mods by Tom Lane
1 parent 76a6da8 commit 4142769

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

src/bin/psql/prompt.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* Copyright 2000 by PostgreSQL Global Development Group
55
*
6-
* $Header: /cvsroot/pgsql/src/bin/psql/prompt.c,v 1.19 2001/05/06 17:21:11 petere Exp $
6+
* $Header: /cvsroot/pgsql/src/bin/psql/prompt.c,v 1.20 2001/08/24 16:59:10 momjian Exp $
77
*/
88
#include "postgres_fe.h"
99
#include "prompt.h"
@@ -129,6 +129,7 @@ get_prompt(promptStatus_t status)
129129
if (*p == 'm')
130130
buf[strcspn(buf, ".")] = '\0';
131131
}
132+
#ifndef HAVE_UNIX_SOCKETS
132133
/* UNIX socket */
133134
else
134135
{
@@ -139,6 +140,7 @@ get_prompt(promptStatus_t status)
139140
else
140141
snprintf(buf, MAX_PROMPT_SIZE, "[local:%s]", host);
141142
}
143+
#endif
142144
}
143145
break;
144146
/* DB server port number */

src/include/libpq/hba.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,16 @@
44
* Interface to hba.c
55
*
66
*
7-
* $Id: hba.h,v 1.24 2001/08/16 16:24:16 momjian Exp $
7+
* $Id: hba.h,v 1.25 2001/08/24 16:59:10 momjian Exp $
88
*
99
*-------------------------------------------------------------------------
1010
*/
1111
#ifndef HBA_H
1212
#define HBA_H
1313

14+
#ifndef WIN32
1415
#include <netinet/in.h>
16+
#endif
1517

1618
#define CONF_FILE "pg_hba.conf"
1719
/* Name of the config file */

0 commit comments

Comments
 (0)