diff options
author | Bruce Momjian <bruce@momjian.us> | 2006-06-07 22:24:46 +0000 |
---|---|---|
committer | Bruce Momjian <bruce@momjian.us> | 2006-06-07 22:24:46 +0000 |
commit | 399a36a75d2d06bfdb91402713d408271b4833ba (patch) | |
tree | b8391f6bda4680d37ac430c3270c67bde979d842 /src/bin/psql/print.c | |
parent | 877e296306a2017a18fc7086e9742c8ee3e0a665 (diff) |
Prepare code to be built by MSVC:
o remove many WIN32_CLIENT_ONLY defines
o add WIN32_ONLY_COMPILER define
o add 3rd argument to open() for portability
o add include/port/win32_msvc directory for
system includes
Magnus Hagander
Diffstat (limited to 'src/bin/psql/print.c')
-rw-r--r-- | src/bin/psql/print.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/bin/psql/print.c b/src/bin/psql/print.c index d3b70896bfe..1ad04783d0c 100644 --- a/src/bin/psql/print.c +++ b/src/bin/psql/print.c @@ -3,7 +3,7 @@ * * Copyright (c) 2000-2006, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/bin/psql/print.c,v 1.85 2006/03/05 15:58:51 momjian Exp $ + * $PostgreSQL: pgsql/src/bin/psql/print.c,v 1.86 2006/06/07 22:24:45 momjian Exp $ */ #include "postgres_fe.h" #include "common.h" @@ -11,10 +11,7 @@ #include <math.h> #include <signal.h> - -#ifndef WIN32_CLIENT_ONLY #include <unistd.h> -#endif #ifndef WIN32 #include <sys/ioctl.h> /* for ioctl() */ @@ -641,10 +638,10 @@ print_aligned_text(const char *title, const char *const * headers, for (ptr = footers; *ptr; ptr++) fprintf(fout, "%s\n", *ptr); -#ifndef __MINGW32__ +#ifndef WIN32 /* - * for some reason MinGW outputs an extra newline, so this supresses it + * for some reason MinGW (and MSVC) outputs an extra newline, so this supresses it */ fputc('\n', fout); #endif |