From: Bruce Momjian <bruce@momjian.us>
Date: Fri, 24 Aug 2001 16:59:10 +0000 (+0000)
Subject: There are two problems when compiling libpq.dll and psql.exe
X-Git-Tag: REL7_2_BETA1~629
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=41427692577801580562aeaee2164c54db2257eb;p=thirdparty%2Fpostgresql.git

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
---

diff --git a/src/bin/psql/prompt.c b/src/bin/psql/prompt.c
index 974e97022d6..e0b98c1a59c 100644
--- a/src/bin/psql/prompt.c
+++ b/src/bin/psql/prompt.c
@@ -3,7 +3,7 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/prompt.c,v 1.19 2001/05/06 17:21:11 petere Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/prompt.c,v 1.20 2001/08/24 16:59:10 momjian Exp $
  */
 #include "postgres_fe.h"
 #include "prompt.h"
@@ -129,6 +129,7 @@ get_prompt(promptStatus_t status)
 							if (*p == 'm')
 								buf[strcspn(buf, ".")] = '\0';
 						}
+#ifndef HAVE_UNIX_SOCKETS
 						/* UNIX socket */
 						else
 						{
@@ -139,6 +140,7 @@ get_prompt(promptStatus_t status)
 							else
 								snprintf(buf, MAX_PROMPT_SIZE, "[local:%s]", host);
 						}
+#endif
 					}
 					break;
 					/* DB server port number */
diff --git a/src/include/libpq/hba.h b/src/include/libpq/hba.h
index da506d7aee8..02eee16d9a0 100644
--- a/src/include/libpq/hba.h
+++ b/src/include/libpq/hba.h
@@ -4,14 +4,16 @@
  *	  Interface to hba.c
  *
  *
- * $Id: hba.h,v 1.24 2001/08/16 16:24:16 momjian Exp $
+ * $Id: hba.h,v 1.25 2001/08/24 16:59:10 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef HBA_H
 #define HBA_H
 
+#ifndef WIN32
 #include <netinet/in.h>
+#endif
 
 #define CONF_FILE "pg_hba.conf"
  /* Name of the config file  */