Commit 41427692 authored by Bruce Momjian's avatar Bruce Momjian

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
parent 76a6da8a
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* *
* Copyright 2000 by PostgreSQL Global Development Group * 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 "postgres_fe.h"
#include "prompt.h" #include "prompt.h"
...@@ -129,6 +129,7 @@ get_prompt(promptStatus_t status) ...@@ -129,6 +129,7 @@ get_prompt(promptStatus_t status)
if (*p == 'm') if (*p == 'm')
buf[strcspn(buf, ".")] = '\0'; buf[strcspn(buf, ".")] = '\0';
} }
#ifndef HAVE_UNIX_SOCKETS
/* UNIX socket */ /* UNIX socket */
else else
{ {
...@@ -139,6 +140,7 @@ get_prompt(promptStatus_t status) ...@@ -139,6 +140,7 @@ get_prompt(promptStatus_t status)
else else
snprintf(buf, MAX_PROMPT_SIZE, "[local:%s]", host); snprintf(buf, MAX_PROMPT_SIZE, "[local:%s]", host);
} }
#endif
} }
break; break;
/* DB server port number */ /* DB server port number */
......
...@@ -4,14 +4,16 @@ ...@@ -4,14 +4,16 @@
* Interface to hba.c * 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 #ifndef HBA_H
#define HBA_H #define HBA_H
#ifndef WIN32
#include <netinet/in.h> #include <netinet/in.h>
#endif
#define CONF_FILE "pg_hba.conf" #define CONF_FILE "pg_hba.conf"
/* Name of the config file */ /* Name of the config file */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment