diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2018-10-10 00:18:00 -0400 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2018-10-10 00:18:00 -0400 |
| commit | 24a06ed38135679efe65e3a6cf844c64cd04f79e (patch) | |
| tree | d737fbd9e895a696d13967204efecd22da22eb24 /backend | |
| parent | 19dc16f764492eb3b1cf7c57b7f645e214cb9b3a (diff) | |
| download | cups-24a06ed38135679efe65e3a6cf844c64cd04f79e.tar.gz | |
Migrate Windows conditional code to _WIN32 define.
Diffstat (limited to 'backend')
| -rw-r--r-- | backend/lpd.c | 16 | ||||
| -rw-r--r-- | backend/socket.c | 4 | ||||
| -rw-r--r-- | backend/test1284.c | 4 | ||||
| -rw-r--r-- | backend/usb.c | 4 |
4 files changed, 14 insertions, 14 deletions
diff --git a/backend/lpd.c b/backend/lpd.c index 0fbe38c44..e705ed406 100644 --- a/backend/lpd.c +++ b/backend/lpd.c @@ -19,14 +19,14 @@ #include <sys/stat.h> #include <stdio.h> -#ifdef WIN32 +#ifdef _WIN32 # include <winsock.h> #else # include <sys/socket.h> # include <netinet/in.h> # include <arpa/inet.h> # include <netdb.h> -#endif /* WIN32 */ +#endif /* _WIN32 */ #ifdef __APPLE__ # include <CoreFoundation/CFNumber.h> # include <CoreFoundation/CFPreferences.h> @@ -618,11 +618,11 @@ cups_rresvport(int *port, /* IO - Port number to bind to */ * -1... */ -#ifdef WIN32 +#ifdef _WIN32 closesocket(fd); #else close(fd); -#endif /* WIN32 */ +#endif /* _WIN32 */ return (-1); } @@ -730,11 +730,11 @@ lpd_queue(const char *hostname, /* I - Host to connect to */ ssize_t nbytes; /* Number of bytes written */ off_t tbytes; /* Total bytes written */ char buffer[32768]; /* Output buffer */ -#ifdef WIN32 +#ifdef _WIN32 DWORD tv; /* Timeout in milliseconds */ #else struct timeval tv; /* Timeout in secs and usecs */ -#endif /* WIN32 */ +#endif /* _WIN32 */ /* @@ -917,7 +917,7 @@ lpd_queue(const char *hostname, /* I - Host to connect to */ * Set the timeout... */ -#ifdef WIN32 +#ifdef _WIN32 tv = (DWORD)(timeout * 1000); setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, (char *)&tv, sizeof(tv)); @@ -928,7 +928,7 @@ lpd_queue(const char *hostname, /* I - Host to connect to */ setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv)); setsockopt(fd, SOL_SOCKET, SO_SNDTIMEO, &tv, sizeof(tv)); -#endif /* WIN32 */ +#endif /* _WIN32 */ fputs("STATE: -connecting-to-device\n", stderr); _cupsLangPrintFilter(stderr, "INFO", _("Connected to printer.")); diff --git a/backend/socket.c b/backend/socket.c index 0a94f08b8..675061dd9 100644 --- a/backend/socket.c +++ b/backend/socket.c @@ -18,7 +18,7 @@ #include <sys/types.h> #include <sys/stat.h> -#ifdef WIN32 +#ifdef _WIN32 # include <winsock.h> #else # include <unistd.h> @@ -27,7 +27,7 @@ # include <netinet/in.h> # include <arpa/inet.h> # include <netdb.h> -#endif /* WIN32 */ +#endif /* _WIN32 */ /* diff --git a/backend/test1284.c b/backend/test1284.c index 97825f583..2da108650 100644 --- a/backend/test1284.c +++ b/backend/test1284.c @@ -13,12 +13,12 @@ */ #include <cups/string-private.h> -#ifdef WIN32 +#ifdef _WIN32 # include <io.h> #else # include <unistd.h> # include <fcntl.h> -#endif /* WIN32 */ +#endif /* _WIN32 */ #include "ieee1284.c" diff --git a/backend/usb.c b/backend/usb.c index a870a6b6d..e1b2c03dc 100644 --- a/backend/usb.c +++ b/backend/usb.c @@ -19,13 +19,13 @@ #include "backend-private.h" -#ifdef WIN32 +#ifdef _WIN32 # include <io.h> #else # include <unistd.h> # include <fcntl.h> # include <termios.h> -#endif /* WIN32 */ +#endif /* _WIN32 */ /* |