mirror of
https://github.com/postgres/postgres.git
synced 2025-07-30 11:03:19 +03:00
> Ok, where's a "system dependent hack" :)
> It seems that win9x doesn't have the "netmsg.dll" so it defaults to "normal" > FormatMessage. > I wonder if one could load wsock32.dll or winsock.dll on those systems > instead of netmsg.dll. > > Mikhail, could you please test this code on your nt4 system? > Could someone else test this code on a win98/95 system? > > It works on win2k over here. It works on win2k here too but not on win98/95 or winNT. Anyway, attached is the patch which uses Magnus's my_sock_strerror function (renamed to winsock_strerror). The only difference is that I put the code to load and unload netmsg.dll in the libpqdll.c (is this OK Magnus?). Mikhail Terekhov
This commit is contained in:
@ -8,7 +8,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.107 2001/08/17 15:11:15 momjian Exp $
|
||||
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.108 2001/08/21 20:39:53 momjian Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@ -2038,10 +2038,6 @@ PQoidStatus(const PGresult *res)
|
||||
return buf;
|
||||
}
|
||||
|
||||
#ifdef WIN32 /* need to get at normal errno here */
|
||||
#undef errno
|
||||
#endif
|
||||
|
||||
/*
|
||||
PQoidValue -
|
||||
a perhaps preferable form of the above which just returns
|
||||
@ -2056,7 +2052,11 @@ PQoidValue(const PGresult *res)
|
||||
if (!res || !res->cmdStatus || strncmp(res->cmdStatus, "INSERT ", 7) != 0)
|
||||
return InvalidOid;
|
||||
|
||||
#ifdef WIN32
|
||||
SetLastError(0);
|
||||
#else
|
||||
errno = 0;
|
||||
#endif
|
||||
result = strtoul(res->cmdStatus + 7, &endptr, 10);
|
||||
|
||||
if (!endptr || (*endptr != ' ' && *endptr != '\0') || errno == ERANGE)
|
||||
@ -2065,9 +2065,6 @@ PQoidValue(const PGresult *res)
|
||||
return (Oid) result;
|
||||
}
|
||||
|
||||
#ifdef WIN32 /* back to socket errno */
|
||||
#define errno WSAGetLastError()
|
||||
#endif
|
||||
|
||||
/*
|
||||
PQcmdTuples -
|
||||
|
Reference in New Issue
Block a user