diff options
| author | Bruce Momjian <bruce@momjian.us> | 1998-10-08 00:10:49 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 1998-10-08 00:10:49 +0000 |
| commit | 30debec6e57b0678ec101eb5469d025384ed8c8d (patch) | |
| tree | 13beaa143ccd06824ce90b7f5c3f9cfd81377c4d /src/bin/psql/psql.c | |
| parent | cb4292ea64749a3faf2a2b6ec737576a39e83f6a (diff) | |
| download | postgresql-30debec6e57b0678ec101eb5469d025384ed8c8d.tar.gz postgresql-30debec6e57b0678ec101eb5469d025384ed8c8d.zip | |
Hello!
Here are two new patches for the Win32 support.
1) The patch based on the one from Hiroshi Inoue [Inoue@tpf.co.jp], to
load
Winsock.dll from libpq.dll.
2) A patch for psql.c to remove the call to WSAStartup(), since it is
not
required when it's done in libpq.dll.
I'm still looking for the possibility of having a crypt() function in
libpq.dll too, the same way getopt was included. Any chance of getting
this
before 6.4, or should we wait for the next one?
//Magnus
Diffstat (limited to 'src/bin/psql/psql.c')
| -rw-r--r-- | src/bin/psql/psql.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/src/bin/psql/psql.c b/src/bin/psql/psql.c index dfc91ee7943..485ef54ecf5 100644 --- a/src/bin/psql/psql.c +++ b/src/bin/psql/psql.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.161 1998/09/21 02:25:23 momjian Exp $ + * $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.162 1998/10/08 00:10:47 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -2724,18 +2724,6 @@ main(int argc, char **argv) char *home = NULL; /* Used to store $HOME */ -#ifdef WIN32 - { - WSADATA wsaData; - - if (WSAStartup(MAKEWORD(1, 1), &wsaData)) - { - fprintf(stderr, "Failed to start winsock: %i\n", WSAGetLastError()); - exit(1); - } - } -#endif - MemSet(&settings, 0, sizeof settings); settings.opt.align = 1; settings.opt.header = 1; |