diff options
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/c.h | 16 | ||||
| -rw-r--r-- | src/include/port.h | 5 |
2 files changed, 5 insertions, 16 deletions
diff --git a/src/include/c.h b/src/include/c.h index 0562157333a..325cfc217d0 100644 --- a/src/include/c.h +++ b/src/include/c.h @@ -12,7 +12,7 @@ * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/c.h,v 1.159 2004/01/10 23:39:51 neilc Exp $ + * $PostgreSQL: pgsql/src/include/c.h,v 1.160 2004/03/10 21:12:46 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -689,20 +689,6 @@ typedef NameData *Name; #define PG_BINARY_W "w" #endif -#if !defined(WIN32) && !defined(__BEOS__) -#define FCNTL_NONBLOCK(sock) fcntl(sock, F_SETFL, O_NONBLOCK) -#else -extern long ioctlsocket_ret; - -/* Returns non-0 on failure, while fcntl() returns -1 on failure */ -#ifdef WIN32 -#define FCNTL_NONBLOCK(sock) ((ioctlsocket(sock, FIONBIO, &ioctlsocket_ret) == 0) ? 0 : -1) -#endif -#ifdef __BEOS__ -#define FCNTL_NONBLOCK(sock) ((ioctl(sock, FIONBIO, &ioctlsocket_ret) == 0) ? 0 : -1) -#endif -#endif - #if defined(sun) && defined(__sparc__) && !defined(__SVR4) #include <unistd.h> #endif diff --git a/src/include/port.h b/src/include/port.h index fefdff117ec..4f52075308a 100644 --- a/src/include/port.h +++ b/src/include/port.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/port.h,v 1.21 2004/03/09 04:49:02 momjian Exp $ + * $PostgreSQL: pgsql/src/include/port.h,v 1.22 2004/03/10 21:12:46 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -17,6 +17,9 @@ #include <netdb.h> #endif +/* non-blocking */ +bool set_noblock(int sock); + /* Portable path handling for Unix/Win32 */ extern bool is_absolute_path(const char *filename); extern char *first_path_separator(const char *filename); |