Re: libpq.dll & psql.exe on Win32 - Mailing list pgsql-hackers

I have applied the attached patch that is basically your patch with
Tom's suggestion to use HAVE_UNIX_SOCKETS.

> Hi,
> 
> 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.) Comments?
> 
> Regards,
> Mikhail Terekhov
> 
> Index: bin/psql/prompt.c
> ===================================================================
> RCS file: /home/projects/pgsql/cvsroot/pgsql/src/bin/psql/prompt.c,v
> retrieving revision 1.19
> diff -C3 -r1.19 prompt.c
> *** bin/psql/prompt.c    2001/05/06 17:21:11    1.19
> --- bin/psql/prompt.c    2001/08/22 18:27:26
> ***************
> *** 129,134 ****
> --- 129,135 ----
>                               if (*p == 'm')
>                                   buf[strcspn(buf, ".")] = '\0';
>                           }
> + #ifndef WIN32
>                           /* UNIX socket */
>                           else
>                           {
> ***************
> *** 139,144 ****
> --- 140,146 ----
>                               else
>                                   snprintf(buf, MAX_PROMPT_SIZE, "[local:%s]", host);
>                           }
> + #endif
>                       }
>                       break;
>                       /* DB server port number */
> Index: include/libpq/hba.h
> ===================================================================
> RCS file: /home/projects/pgsql/cvsroot/pgsql/src/include/libpq/hba.h,v
> retrieving revision 1.24
> diff -C3 -r1.24 hba.h
> *** include/libpq/hba.h    2001/08/16 16:24:16    1.24
> --- include/libpq/hba.h    2001/08/22 18:27:26
> ***************
> *** 11,17 ****
> --- 11,19 ----
>   #ifndef HBA_H
>   #define HBA_H
>   
> + #ifndef WIN32
>   #include <netinet/in.h>
> + #endif
>   
>   #define CONF_FILE "pg_hba.conf"
>    /* Name of the config file  */
> 
> ---------------------------(end of broadcast)---------------------------
> TIP 6: Have you searched our list archives?
> 
> http://www.postgresql.org/search.mpl
> 

--  Bruce Momjian                        |  http://candle.pha.pa.us pgman@candle.pha.pa.us               |  (610)
853-3000+  If your life is a hard drive,     |  830 Blythe Avenue +  Christ can be your backup.        |  Drexel Hill,
Pennsylvania19026 
Index: src/bin/psql/prompt.c
===================================================================
RCS file: /home/projects/pgsql/cvsroot/pgsql/src/bin/psql/prompt.c,v
retrieving revision 1.19
diff -c -r1.19 prompt.c
*** src/bin/psql/prompt.c    2001/05/06 17:21:11    1.19
--- src/bin/psql/prompt.c    2001/08/24 16:55:13
***************
*** 129,134 ****
--- 129,135 ----                             if (*p == 'm')                                 buf[strcspn(buf, ".")] =
'\0';                        }
 
+ #ifndef HAVE_UNIX_SOCKETS                         /* UNIX socket */                         else
  {
 
***************
*** 139,144 ****
--- 140,146 ----                             else                                 snprintf(buf, MAX_PROMPT_SIZE,
"[local:%s]",host);                         }
 
+ #endif                     }                     break;                     /* DB server port number */
Index: src/include/libpq/hba.h
===================================================================
RCS file: /home/projects/pgsql/cvsroot/pgsql/src/include/libpq/hba.h,v
retrieving revision 1.24
diff -c -r1.24 hba.h
*** src/include/libpq/hba.h    2001/08/16 16:24:16    1.24
--- src/include/libpq/hba.h    2001/08/24 16:55:13
***************
*** 11,17 ****
--- 11,19 ---- #ifndef HBA_H #define HBA_H 
+ #ifndef WIN32 #include <netinet/in.h>
+ #endif  #define CONF_FILE "pg_hba.conf"  /* Name of the config file  */