Change naming convention of POSIX emulation layer for Windows

Use prefix w32 instead of posix: Rename posixfile.c, posixio.c to
w32file.c, w32io.c.  Rename posix_accept(), posix_bind(),
posix_close(), posix_fd2socket(), posix_listen(), posix_mkdir(),
posix_setsockopt(), posix_shutdown(), posix_socket() to w32_accept(),
w32_bind(), w32_fd2socket(), w32_list(), w32_mkdir(),
w32_setsockopt(), w32_shutdown(), w32_socket().
This commit is contained in:
Markus Armbruster 2009-04-13 19:55:12 +02:00
parent 4c6deb1f98
commit c9de868d55
6 changed files with 31 additions and 31 deletions

View file

@ -546,7 +546,7 @@ empth_select(int fd, int flags, struct timeval *timeout)
hEventObject[0] = WSACreateEvent(); hEventObject[0] = WSACreateEvent();
hEventObject[1] = pThread->hThreadEvent; hEventObject[1] = pThread->hThreadEvent;
sock = posix_fd2socket(fd); sock = w32_fd2socket(fd);
CANT_HAPPEN(sock == (SOCKET)-1); CANT_HAPPEN(sock == (SOCKET)-1);
events = 0; events = 0;

View file

@ -40,28 +40,28 @@
typedef int socklen_t; typedef int socklen_t;
#define accept(fd, addr, addrlen) \ #define accept(fd, addr, addrlen) \
posix_accept((fd), (addr), (addrlen)) w32_accept((fd), (addr), (addrlen))
#define bind(fd, name, namelen) \ #define bind(fd, name, namelen) \
posix_bind((fd), (name), (namelen)) w32_bind((fd), (name), (namelen))
#define listen(fd, backlog) \ #define listen(fd, backlog) \
posix_listen((fd), (backlog)) w32_listen((fd), (backlog))
#define setsockopt(fd, level, optname, optval, optlen) \ #define setsockopt(fd, level, optname, optval, optlen) \
posix_setsockopt((fd), (level), (optname), (optval), (optlen)) w32_setsockopt((fd), (level), (optname), (optval), (optlen))
#define shutdown(fd, how) \ #define shutdown(fd, how) \
posix_shutdown((fd), (how)) w32_shutdown((fd), (how))
#define socket(domain, type, protocol) \ #define socket(domain, type, protocol) \
posix_socket((domain), (type), (protocol)) w32_socket((domain), (type), (protocol))
extern int posix_accept(int fd, struct sockaddr *addr, socklen_t *addrlen); extern int w32_accept(int fd, struct sockaddr *addr, socklen_t *addrlen);
extern int posix_bind(int fd, const struct sockaddr *name, socklen_t namelen); extern int w32_bind(int fd, const struct sockaddr *name, socklen_t namelen);
extern int posix_listen(int fd, int backlog); extern int w32_listen(int fd, int backlog);
extern int posix_setsockopt(int fd, int level, int optname, extern int w32_setsockopt(int fd, int level, int optname,
const void *optval, socklen_t optlen); const void *optval, socklen_t optlen);
extern int posix_shutdown(int fd, int how); extern int w32_shutdown(int fd, int how);
extern int posix_socket(int domain, int type, int protocol); extern int w32_socket(int domain, int type, int protocol);
/* Low-level stuff specific to the emulation */ /* Low-level stuff specific to the emulation */
extern SOCKET posix_fd2socket(int fd); extern SOCKET w32_fd2socket(int fd);
extern void w32_set_winsock_errno(void); extern void w32_set_winsock_errno(void);
extern int w32_socket_init(void); extern int w32_socket_init(void);

View file

@ -60,11 +60,11 @@ extern char *optarg;
extern int optind, opterr, optopt; extern int optind, opterr, optopt;
/* /*
* posixfile.c * w32file.c
*/ */
/* Should be in sys/stat.h */ /* Should be in sys/stat.h */
#define mkdir(dir, perm) posix_mkdir((dir), (perm)) #define mkdir(dir, perm) w32_mkdir((dir), (perm))
extern int posix_mkdir(const char *dirname, mode_t perm); extern int w32_mkdir(const char *dirname, mode_t perm);
/* Should be in sys/stat.h */ /* Should be in sys/stat.h */
#ifndef S_IRUSR #ifndef S_IRUSR

View file

@ -25,7 +25,7 @@
* *
* --- * ---
* *
* posixfile.c: POSIX equivalents for file operations * w32file.c: POSIX file operations emulation layer for Windows
* *
* Known contributors to this file: * Known contributors to this file:
* Ron Koenderink, 2007 * Ron Koenderink, 2007
@ -38,11 +38,11 @@
#include "unistd.h" #include "unistd.h"
/* /*
* POSIX equivalent for mkdir(). * POSIX-compatible replacement for mkdir().
* Windows does not set the permission directly with mkdir(). * Windows' mkdir() lacks the second parameter.
*/ */
int int
posix_mkdir(const char *dirname, mode_t perm) w32_mkdir(const char *dirname, mode_t perm)
{ {
int result; int result;

View file

@ -25,7 +25,7 @@
* *
* --- * ---
* *
* posixio.c: POSIX I/O emulation layer for Windows * w32io.c: POSIX I/O emulation layer for Windows
* *
* Known contributors to this file: * Known contributors to this file:
* Ron Koenderink, 2007 * Ron Koenderink, 2007

View file

@ -59,7 +59,7 @@
#define W32_SOCKET_TO_FD(fh) (_open_osfhandle((long)(fh), O_RDWR | O_BINARY)) #define W32_SOCKET_TO_FD(fh) (_open_osfhandle((long)(fh), O_RDWR | O_BINARY))
SOCKET SOCKET
posix_fd2socket(int fd) w32_fd2socket(int fd)
{ {
return W32_FD_TO_SOCKET(fd); return W32_FD_TO_SOCKET(fd);
} }
@ -124,7 +124,7 @@ w32_set_winsock_errno(void)
*/ */
#undef accept #undef accept
int int
posix_accept(int fd, struct sockaddr *addr, socklen_t *addrlen) w32_accept(int fd, struct sockaddr *addr, socklen_t *addrlen)
{ {
SOCKET sock; SOCKET sock;
@ -142,7 +142,7 @@ posix_accept(int fd, struct sockaddr *addr, socklen_t *addrlen)
*/ */
#undef bind #undef bind
int int
posix_bind(int fd, const struct sockaddr *name, socklen_t namelen) w32_bind(int fd, const struct sockaddr *name, socklen_t namelen)
{ {
SOCKET_FUNCTION(bind(sock, name, namelen)); SOCKET_FUNCTION(bind(sock, name, namelen));
} }
@ -152,7 +152,7 @@ posix_bind(int fd, const struct sockaddr *name, socklen_t namelen)
*/ */
#undef listen #undef listen
int int
posix_listen(int fd, int backlog) w32_listen(int fd, int backlog)
{ {
SOCKET_FUNCTION(listen(sock, backlog)); SOCKET_FUNCTION(listen(sock, backlog));
} }
@ -162,7 +162,7 @@ posix_listen(int fd, int backlog)
*/ */
#undef setsockopt #undef setsockopt
int int
posix_setsockopt(int fd, int level, int optname, w32_setsockopt(int fd, int level, int optname,
const void *optval, socklen_t optlen) const void *optval, socklen_t optlen)
{ {
/* /*
@ -186,7 +186,7 @@ posix_setsockopt(int fd, int level, int optname,
*/ */
#undef shutdown #undef shutdown
int int
posix_shutdown(int fd, int how) w32_shutdown(int fd, int how)
{ {
SOCKET_FUNCTION(shutdown(sock, how)); SOCKET_FUNCTION(shutdown(sock, how));
} }
@ -196,7 +196,7 @@ posix_shutdown(int fd, int how)
*/ */
#undef socket #undef socket
int int
posix_socket(int domain, int type, int protocol) w32_socket(int domain, int type, int protocol)
{ {
SOCKET sock; SOCKET sock;