diff options
| author | Bruce Momjian <bruce@momjian.us> | 2003-10-26 04:29:15 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2003-10-26 04:29:15 +0000 |
| commit | b80b384b788481a10609881a449aa5f7929cec8d (patch) | |
| tree | 9dcf0bb749cf9c44f6804532ddf9ea81502a5fb5 /src | |
| parent | 2cd5abd4d1e6aa5b32c9911c8e8e83aded9454a4 (diff) | |
| download | postgresql-b80b384b788481a10609881a449aa5f7929cec8d.tar.gz postgresql-b80b384b788481a10609881a449aa5f7929cec8d.zip | |
Allow win32 client compiles with MSC.
Hiroshi Saito
Diffstat (limited to 'src')
| -rw-r--r-- | src/bin/psql/win32.mak | 7 | ||||
| -rw-r--r-- | src/port/sprompt.c | 3 | ||||
| -rw-r--r-- | src/port/thread.c | 12 |
3 files changed, 17 insertions, 5 deletions
diff --git a/src/bin/psql/win32.mak b/src/bin/psql/win32.mak index cfb63d478de..072b30d6a1a 100644 --- a/src/bin/psql/win32.mak +++ b/src/bin/psql/win32.mak @@ -33,6 +33,7 @@ CLEAN : -@erase "$(INTDIR)\print.obj" -@erase "$(INTDIR)\describe.obj" -@erase "$(INTDIR)\tab-complete.obj" + -@erase "$(INTDIR)\sprompt.obj" -@erase "$(INTDIR)\getopt.obj" -@erase "$(INTDIR)\getopt_long.obj" -@erase "$(INTDIR)\path.obj" @@ -70,6 +71,7 @@ LINK32_OBJS= \ "$(INTDIR)\print.obj" \ "$(INTDIR)\describe.obj" \ "$(INTDIR)\tab-complete.obj" \ + "$(INTDIR)\sprompt.obj" \ "$(INTDIR)\getopt.obj" \ "$(INTDIR)\getopt_long.obj" \ "$(INTDIR)\path.obj" \ @@ -81,6 +83,11 @@ LINK32_OBJS= \ $(LINK32_FLAGS) $(LINK32_OBJS) << +"$(OUTDIR)\sprompt.obj" : "$(OUTDIR)" ..\..\port\sprompt.c + $(CPP) @<< + $(CPP_PROJ) ..\..\port\sprompt.c +<< + "$(OUTDIR)\getopt.obj" : "$(OUTDIR)" ..\..\port\getopt.c $(CPP) @<< $(CPP_PROJ) ..\..\port\getopt.c diff --git a/src/port/sprompt.c b/src/port/sprompt.c index c47d6bc63d5..185d9972d8a 100644 --- a/src/port/sprompt.c +++ b/src/port/sprompt.c @@ -3,7 +3,7 @@ * * Copyright 2000 by PostgreSQL Global Development Group * - * $Header: /cvsroot/pgsql/src/port/sprompt.c,v 1.1 2003/08/08 04:52:22 momjian Exp $ + * $Header: /cvsroot/pgsql/src/port/sprompt.c,v 1.2 2003/10/26 04:29:15 momjian Exp $ */ @@ -26,6 +26,7 @@ #else #ifdef WIN32 #include <windows.h> +#undef ERROR #endif #endif diff --git a/src/port/thread.c b/src/port/thread.c index a37a0ed4fd9..c77c5586bba 100644 --- a/src/port/thread.c +++ b/src/port/thread.c @@ -7,19 +7,23 @@ * * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group * - * $Id: thread.c,v 1.11 2003/10/24 20:48:10 momjian Exp $ + * $Id: thread.c,v 1.12 2003/10/26 04:29:15 momjian Exp $ * *------------------------------------------------------------------------- */ #include "postgres.h" +#include <sys/types.h> +#include <errno.h> +#if defined(WIN32) && defined(_MSC_VER) +#undef ERROR +#else +#include <pwd.h> +#endif #if defined(USE_THREADS) #include <pthread.h> #endif -#include <sys/types.h> -#include <pwd.h> -#include <errno.h> /* * Threading sometimes requires specially-named versions of functions |