From: Michael R Sweet Date: Wed, 17 Oct 2018 17:09:57 +0000 (-0400) Subject: Switch to _WIN32 for Windows test. X-Git-Tag: v2.2.9~11 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0313a59eaaad9099a05ba55f7b6f96c47f605e1b;p=thirdparty%2Fcups.git Switch to _WIN32 for Windows test. --- diff --git a/backend/lpd.c b/backend/lpd.c index 4325b7c788..d8c2e6b155 100644 --- a/backend/lpd.c +++ b/backend/lpd.c @@ -24,14 +24,14 @@ #include #include -#ifdef WIN32 +#ifdef _WIN32 # include #else # include # include # include # include -#endif /* WIN32 */ +#endif /* _WIN32 */ #ifdef __APPLE__ # include # include @@ -623,11 +623,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); } @@ -735,11 +735,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 */ /* @@ -922,7 +922,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)); @@ -933,7 +933,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 c16a1a097d..daeafe20df 100644 --- a/backend/socket.c +++ b/backend/socket.c @@ -23,7 +23,7 @@ #include #include -#ifdef WIN32 +#ifdef _WIN32 # include #else # include @@ -32,7 +32,7 @@ # include # include # include -#endif /* WIN32 */ +#endif /* _WIN32 */ /* diff --git a/backend/test1284.c b/backend/test1284.c index 85ac8b5b34..b55bb8e0e3 100644 --- a/backend/test1284.c +++ b/backend/test1284.c @@ -18,12 +18,12 @@ */ #include -#ifdef WIN32 +#ifdef _WIN32 # include #else # include # include -#endif /* WIN32 */ +#endif /* _WIN32 */ #include "ieee1284.c" diff --git a/backend/usb.c b/backend/usb.c index a3b6fba097..b71f21dc36 100644 --- a/backend/usb.c +++ b/backend/usb.c @@ -24,13 +24,13 @@ #include "backend-private.h" -#ifdef WIN32 +#ifdef _WIN32 # include #else # include # include # include -#endif /* WIN32 */ +#endif /* _WIN32 */ /* diff --git a/cgi-bin/cgi.h b/cgi-bin/cgi.h index 0c360cb18a..c2e5789396 100644 --- a/cgi-bin/cgi.h +++ b/cgi-bin/cgi.h @@ -19,12 +19,12 @@ # include # include -# ifdef WIN32 +# ifdef _WIN32 # include # include # else # include -# endif /* WIN32 */ +# endif /* _WIN32 */ # include # include diff --git a/cups/adminutil.c b/cups/adminutil.c index adb1f7ae32..375b9054e9 100644 --- a/cups/adminutil.c +++ b/cups/adminutil.c @@ -22,11 +22,11 @@ #include "adminutil.h" #include #include -#ifdef WIN32 +#ifdef _WIN32 #else # include # include -#endif /* WIN32 */ +#endif /* _WIN32 */ /* @@ -2087,7 +2087,7 @@ do_samba_command(const char *command, /* I - Command to run */ const char *authfile, /* I - Samba authentication file */ FILE *logfile) /* I - Optional log file */ { -#ifdef WIN32 +#ifdef _WIN32 return (1); /* Always fail on Windows... */ #else @@ -2154,7 +2154,7 @@ do_samba_command(const char *command, /* I - Command to run */ return (WEXITSTATUS(status)); else return (-WTERMSIG(status)); -#endif /* WIN32 */ +#endif /* _WIN32 */ } @@ -2172,9 +2172,9 @@ get_cupsd_conf( int *remote) /* O - Remote file? */ { int fd; /* Temporary file descriptor */ -#ifndef WIN32 +#ifndef _WIN32 struct stat info; /* cupsd.conf file information */ -#endif /* WIN32 */ +#endif /* _WIN32 */ http_status_t status; /* Status of getting cupsd.conf */ char host[HTTP_MAX_HOST]; /* Hostname for connection */ @@ -2191,7 +2191,7 @@ get_cupsd_conf( snprintf(name, namesize, "%s/cupsd.conf", cg->cups_serverroot); *remote = 0; -#ifndef WIN32 +#ifndef _WIN32 if (!_cups_strcasecmp(host, "localhost") && !access(name, R_OK)) { /* @@ -2218,7 +2218,7 @@ get_cupsd_conf( status = HTTP_STATUS_OK; } else -#endif /* !WIN32 */ +#endif /* !_WIN32 */ { /* * Read cupsd.conf via a HTTP GET request... diff --git a/cups/auth.c b/cups/auth.c index a798bdbb33..a1f50423c4 100644 --- a/cups/auth.c +++ b/cups/auth.c @@ -23,11 +23,11 @@ #include "cups-private.h" #include #include -#if defined(WIN32) || defined(__EMX__) +#if defined(_WIN32) || defined(__EMX__) # include #else # include -#endif /* WIN32 || __EMX__ */ +#endif /* _WIN32 || __EMX__ */ #if HAVE_AUTHORIZATION_H # include @@ -901,9 +901,9 @@ static int /* O - 0 if available */ /* -1 error */ cups_local_auth(http_t *http) /* I - HTTP connection to server */ { -#if defined(WIN32) || defined(__EMX__) +#if defined(_WIN32) || defined(__EMX__) /* - * Currently WIN32 and OS-2 do not support the CUPS server... + * Currently _WIN32 and OS-2 do not support the CUPS server... */ return (1); @@ -1104,5 +1104,5 @@ cups_local_auth(http_t *http) /* I - HTTP connection to server */ } return (1); -#endif /* WIN32 || __EMX__ */ +#endif /* _WIN32 || __EMX__ */ } diff --git a/cups/backchannel.c b/cups/backchannel.c index e804d45b7e..bca04dc389 100644 --- a/cups/backchannel.c +++ b/cups/backchannel.c @@ -19,12 +19,12 @@ #include "cups.h" #include -#ifdef WIN32 +#ifdef _WIN32 # include # include #else # include -#endif /* WIN32 */ +#endif /* _WIN32 */ /* @@ -77,11 +77,11 @@ cupsBackChannelRead(char *buffer, /* I - Buffer to read into */ * Read bytes from the pipe... */ -#ifdef WIN32 +#ifdef _WIN32 return ((ssize_t)_read(3, buffer, (unsigned)bytes)); #else return (read(3, buffer, bytes)); -#endif /* WIN32 */ +#endif /* _WIN32 */ } @@ -139,11 +139,11 @@ cupsBackChannelWrite( * Write bytes to the pipe... */ -#ifdef WIN32 +#ifdef _WIN32 count = (ssize_t)_write(3, buffer, (unsigned)(bytes - total)); #else count = write(3, buffer, bytes - total); -#endif /* WIN32 */ +#endif /* _WIN32 */ if (count < 0) { diff --git a/cups/cups.h b/cups/cups.h index 92826d75b3..d0bfc689df 100644 --- a/cups/cups.h +++ b/cups/cups.h @@ -21,12 +21,12 @@ */ # include -# if defined(WIN32) && !defined(__CUPS_SSIZE_T_DEFINED) +# if defined(_WIN32) && !defined(__CUPS_SSIZE_T_DEFINED) # define __CUPS_SSIZE_T_DEFINED # include /* Windows does not support the ssize_t type, so map it to long... */ typedef long ssize_t; /* @private@ */ -# endif /* WIN32 && !__CUPS_SSIZE_T_DEFINED */ +# endif /* _WIN32 && !__CUPS_SSIZE_T_DEFINED */ # include "file.h" # include "ipp.h" diff --git a/cups/debug-private.h b/cups/debug-private.h index 23a0ae1795..3aca6eeddd 100644 --- a/cups/debug-private.h +++ b/cups/debug-private.h @@ -67,7 +67,7 @@ extern "C" { */ # ifdef DEBUG -# ifdef WIN32 +# ifdef _WIN32 # ifdef LIBCUPS2_EXPORTS # define DLLExport __declspec(dllexport) # else @@ -75,7 +75,7 @@ extern "C" { # endif /* LIBCUPS2_EXPORTS */ # else # define DLLExport -# endif /* WIN32 */ +# endif /* _WIN32 */ # define DEBUG_puts(x) _cups_debug_puts(x) # define DEBUG_printf(x) _cups_debug_printf x # define DEBUG_set(logfile,level,filter) _cups_debug_set(logfile,level,filter,1) @@ -99,10 +99,10 @@ extern void DLLExport _cups_debug_puts(const char *s); extern void DLLExport _cups_debug_set(const char *logfile, const char *level, const char *filter, int force); -# ifdef WIN32 +# ifdef _WIN32 extern int _cups_gettimeofday(struct timeval *tv, void *tz); # define gettimeofday(a,b) _cups_gettimeofday(a, b) -# endif /* WIN32 */ +# endif /* _WIN32 */ # ifdef __cplusplus } diff --git a/cups/debug.c b/cups/debug.c index bd244fe72a..43eaad96ab 100644 --- a/cups/debug.c +++ b/cups/debug.c @@ -18,7 +18,7 @@ #include "cups-private.h" #include "thread-private.h" -#ifdef WIN32 +#ifdef _WIN32 # include # include # include @@ -36,7 +36,7 @@ _cups_gettimeofday(struct timeval *tv, /* I - Timeval struct */ #else # include # include -#endif /* WIN32 */ +#endif /* _WIN32 */ #include #include diff --git a/cups/dest.c b/cups/dest.c index 57a8dc95cf..7ef85a1b91 100644 --- a/cups/dest.c +++ b/cups/dest.c @@ -2090,9 +2090,9 @@ cupsSetDests2(http_t *http, /* I - Connection to server or @code CUPS_HTTP_ cups_option_t *option; /* Current option */ _ipp_option_t *match; /* Matching attribute for option */ FILE *fp; /* File pointer */ -#ifndef WIN32 +#ifndef _WIN32 const char *home; /* HOME environment variable */ -#endif /* WIN32 */ +#endif /* _WIN32 */ char filename[1024]; /* lpoptions file */ int num_temps; /* Number of temporary destinations */ cups_dest_t *temps = NULL, /* Temporary destinations */ @@ -2126,7 +2126,7 @@ cupsSetDests2(http_t *http, /* I - Connection to server or @code CUPS_HTTP_ snprintf(filename, sizeof(filename), "%s/lpoptions", cg->cups_serverroot); -#ifndef WIN32 +#ifndef _WIN32 if (getuid()) { /* @@ -2152,7 +2152,7 @@ cupsSetDests2(http_t *http, /* I - Connection to server or @code CUPS_HTTP_ snprintf(filename, sizeof(filename), "%s/.cups/lpoptions", home); } } -#endif /* !WIN32 */ +#endif /* !_WIN32 */ /* * Try to open the file... @@ -2164,7 +2164,7 @@ cupsSetDests2(http_t *http, /* I - Connection to server or @code CUPS_HTTP_ return (-1); } -#ifndef WIN32 +#ifndef _WIN32 /* * Set the permissions to 0644 when saving to the /etc/cups/lpoptions * file... @@ -2172,7 +2172,7 @@ cupsSetDests2(http_t *http, /* I - Connection to server or @code CUPS_HTTP_ if (!getuid()) fchmod(fileno(fp), 0644); -#endif /* !WIN32 */ +#endif /* !_WIN32 */ /* * Write each printer; each line looks like: diff --git a/cups/dir.c b/cups/dir.c index b7cd400cbd..fedceb9cb9 100644 --- a/cups/dir.c +++ b/cups/dir.c @@ -26,7 +26,7 @@ * Windows implementation... */ -#ifdef WIN32 +#ifdef _WIN32 # include /* @@ -145,7 +145,7 @@ cupsDirOpen(const char *directory) /* I - Directory name */ cups_dentry_t * /* O - Directory entry or @code NULL@ if there are no more */ cupsDirRead(cups_dir_t *dp) /* I - Directory pointer */ { - WIN32_FIND_DATA entry; /* Directory entry data */ + _WIN32_FIND_DATA entry; /* Directory entry data */ /* @@ -422,4 +422,4 @@ cupsDirRewind(cups_dir_t *dp) /* I - Directory pointer */ rewinddir(dp->dir); } -#endif /* WIN32 */ +#endif /* _WIN32 */ diff --git a/cups/file-private.h b/cups/file-private.h index 0f01eb7d10..6789283e2d 100644 --- a/cups/file-private.h +++ b/cups/file-private.h @@ -31,10 +31,10 @@ # include # include -# ifdef WIN32 +# ifdef _WIN32 # include # include -# endif /* WIN32 */ +# endif /* _WIN32 */ /* diff --git a/cups/file.c b/cups/file.c index 2a18a61874..5c9ddf8fe5 100644 --- a/cups/file.c +++ b/cups/file.c @@ -73,7 +73,7 @@ static ssize_t cups_read(cups_file_t *fp, char *buf, size_t bytes); static ssize_t cups_write(cups_file_t *fp, const char *buf, size_t bytes); -#ifndef WIN32 +#ifndef _WIN32 /* * '_cupsFileCheck()' - Check the permissions of the given filename. */ @@ -339,7 +339,7 @@ _cupsFileCheckFilter( fprintf(stderr, "%s: %s\n", prefix, message); } -#endif /* !WIN32 */ +#endif /* !_WIN32 */ /* @@ -559,22 +559,22 @@ cupsFileFind(const char *filename, /* I - File to find */ while (*path) { -#ifdef WIN32 +#ifdef _WIN32 if (*path == ';' || (*path == ':' && ((bufptr - buffer) > 1 || !isalpha(buffer[0] & 255)))) #else if (*path == ';' || *path == ':') -#endif /* WIN32 */ +#endif /* _WIN32 */ { if (bufptr > buffer && bufptr[-1] != '/' && bufptr < bufend) *bufptr++ = '/'; strlcpy(bufptr, filename, (size_t)(bufend - bufptr)); -#ifdef WIN32 +#ifdef _WIN32 if (!access(buffer, 0)) #else if (!access(buffer, executable ? X_OK : 0)) -#endif /* WIN32 */ +#endif /* _WIN32 */ { DEBUG_printf(("1cupsFileFind: Returning \"%s\"", buffer)); return (buffer); @@ -1025,11 +1025,11 @@ cupsFileLock(cups_file_t *fp, /* I - CUPS file */ * Try the lock... */ -#ifdef WIN32 +#ifdef _WIN32 return (_locking(fp->fd, block ? _LK_LOCK : _LK_NBLCK, 0)); #else return (lockf(fp->fd, block ? F_LOCK : F_TLOCK, 0)); -#endif /* WIN32 */ +#endif /* _WIN32 */ } @@ -1117,11 +1117,11 @@ cupsFileOpen(const char *filename, /* I - Name of file */ } if (fd >= 0) -#ifdef WIN32 +#ifdef _WIN32 _chsize(fd, 0); #else ftruncate(fd, 0); -#endif /* WIN32 */ +#endif /* _WIN32 */ break; case 's' : /* Read/write socket */ @@ -1288,9 +1288,9 @@ cupsFileOpenFd(int fd, /* I - File descriptor */ * Don't pass this file to child processes... */ -#ifndef WIN32 +#ifndef _WIN32 fcntl(fp->fd, F_SETFD, fcntl(fp->fd, F_GETFD) | FD_CLOEXEC); -#endif /* !WIN32 */ +#endif /* !_WIN32 */ return (fp); } @@ -2064,11 +2064,11 @@ cupsFileUnlock(cups_file_t *fp) /* I - CUPS file */ * Unlock... */ -#ifdef WIN32 +#ifdef _WIN32 return (_locking(fp->fd, _LK_UNLCK, 0)); #else return (lockf(fp->fd, F_ULOCK, 0)); -#endif /* WIN32 */ +#endif /* _WIN32 */ } @@ -2598,9 +2598,9 @@ cups_open(const char *filename, /* I - Filename */ { int fd; /* File descriptor */ struct stat fileinfo; /* File information */ -#ifndef WIN32 +#ifndef _WIN32 struct stat linkinfo; /* Link information */ -#endif /* !WIN32 */ +#endif /* !_WIN32 */ /* @@ -2628,18 +2628,18 @@ cups_open(const char *filename, /* I - Filename */ return (-1); } -#ifdef WIN32 +#ifdef _WIN32 if (fileinfo.st_mode & _S_IFDIR) #else if (S_ISDIR(fileinfo.st_mode)) -#endif /* WIN32 */ +#endif /* _WIN32 */ { close(fd); errno = EISDIR; return (-1); } -#ifndef WIN32 +#ifndef _WIN32 /* * Then use lstat to determine whether the filename is a symlink... */ @@ -2667,7 +2667,7 @@ cups_open(const char *filename, /* I - Filename */ errno = EPERM; return (-1); } -#endif /* !WIN32 */ +#endif /* !_WIN32 */ return (fd); } @@ -2693,7 +2693,7 @@ cups_read(cups_file_t *fp, /* I - CUPS file */ for (;;) { -#ifdef WIN32 +#ifdef _WIN32 if (fp->mode == 's') total = (ssize_t)recv(fp->fd, buf, (unsigned)bytes, 0); else @@ -2703,7 +2703,7 @@ cups_read(cups_file_t *fp, /* I - CUPS file */ total = recv(fp->fd, buf, bytes, 0); else total = read(fp->fd, buf, bytes); -#endif /* WIN32 */ +#endif /* _WIN32 */ DEBUG_printf(("9cups_read: total=" CUPS_LLFMT, CUPS_LLCAST total)); @@ -2750,7 +2750,7 @@ cups_write(cups_file_t *fp, /* I - CUPS file */ total = 0; while (bytes > 0) { -#ifdef WIN32 +#ifdef _WIN32 if (fp->mode == 's') count = (ssize_t)send(fp->fd, buf, (unsigned)bytes, 0); else @@ -2760,7 +2760,7 @@ cups_write(cups_file_t *fp, /* I - CUPS file */ count = send(fp->fd, buf, bytes, 0); else count = write(fp->fd, buf, bytes); -#endif /* WIN32 */ +#endif /* _WIN32 */ DEBUG_printf(("9cups_write: count=" CUPS_LLFMT, CUPS_LLCAST count)); diff --git a/cups/file.h b/cups/file.h index 42abe2086d..73721d4680 100644 --- a/cups/file.h +++ b/cups/file.h @@ -29,11 +29,11 @@ # include "versioning.h" # include # include -# if defined(WIN32) && !defined(__CUPS_SSIZE_T_DEFINED) +# if defined(_WIN32) && !defined(__CUPS_SSIZE_T_DEFINED) # define __CUPS_SSIZE_T_DEFINED /* Windows does not support the ssize_t type, so map it to off_t... */ typedef off_t ssize_t; /* @private@ */ -# endif /* WIN32 && !__CUPS_SSIZE_T_DEFINED */ +# endif /* _WIN32 && !__CUPS_SSIZE_T_DEFINED */ /* diff --git a/cups/getputfile.c b/cups/getputfile.c index 60edbf83fb..7749ae0a8b 100644 --- a/cups/getputfile.c +++ b/cups/getputfile.c @@ -20,11 +20,11 @@ #include "cups-private.h" #include #include -#if defined(WIN32) || defined(__EMX__) +#if defined(_WIN32) || defined(__EMX__) # include #else # include -#endif /* WIN32 || __EMX__ */ +#endif /* _WIN32 || __EMX__ */ /* diff --git a/cups/globals.c b/cups/globals.c index 8a05c3eb1f..28c993be73 100644 --- a/cups/globals.c +++ b/cups/globals.c @@ -34,23 +34,23 @@ static _cups_threadkey_t cups_globals_key = _CUPS_THREADKEY_INITIALIZER; static pthread_once_t cups_globals_key_once = PTHREAD_ONCE_INIT; /* One-time initialization object */ #endif /* HAVE_PTHREAD_H */ -#if defined(HAVE_PTHREAD_H) || defined(WIN32) +#if defined(HAVE_PTHREAD_H) || defined(_WIN32) static _cups_mutex_t cups_global_mutex = _CUPS_MUTEX_INITIALIZER; /* Global critical section */ -#endif /* HAVE_PTHREAD_H || WIN32 */ +#endif /* HAVE_PTHREAD_H || _WIN32 */ /* * Local functions... */ -#ifdef WIN32 +#ifdef _WIN32 static void cups_fix_path(char *path); -#endif /* WIN32 */ +#endif /* _WIN32 */ static _cups_globals_t *cups_globals_alloc(void); -#if defined(HAVE_PTHREAD_H) || defined(WIN32) +#if defined(HAVE_PTHREAD_H) || defined(_WIN32) static void cups_globals_free(_cups_globals_t *g); -#endif /* HAVE_PTHREAD_H || WIN32 */ +#endif /* HAVE_PTHREAD_H || _WIN32 */ #ifdef HAVE_PTHREAD_H static void cups_globals_init(void); #endif /* HAVE_PTHREAD_H */ @@ -65,7 +65,7 @@ _cupsGlobalLock(void) { #ifdef HAVE_PTHREAD_H pthread_mutex_lock(&cups_global_mutex); -#elif defined(WIN32) +#elif defined(_WIN32) EnterCriticalSection(&cups_global_mutex.m_criticalSection); #endif /* HAVE_PTHREAD_H */ } @@ -120,13 +120,13 @@ _cupsGlobalUnlock(void) { #ifdef HAVE_PTHREAD_H pthread_mutex_unlock(&cups_global_mutex); -#elif defined(WIN32) +#elif defined(_WIN32) LeaveCriticalSection(&cups_global_mutex.m_criticalSection); #endif /* HAVE_PTHREAD_H */ } -#ifdef WIN32 +#ifdef _WIN32 /* * 'DllMain()' - Main entry for library. */ @@ -170,7 +170,7 @@ DllMain(HINSTANCE hinst, /* I - DLL module handle */ return (TRUE); } -#endif /* WIN32 */ +#endif /* _WIN32 */ /* @@ -182,13 +182,13 @@ cups_globals_alloc(void) { _cups_globals_t *cg = malloc(sizeof(_cups_globals_t)); /* Pointer to global data */ -#ifdef WIN32 +#ifdef _WIN32 HKEY key; /* Registry key */ DWORD size; /* Size of string */ static char installdir[1024] = "", /* Install directory */ confdir[1024] = "", /* Server root directory */ localedir[1024] = ""; /* Locale directory */ -#endif /* WIN32 */ +#endif /* _WIN32 */ if (!cg) @@ -219,7 +219,7 @@ cups_globals_alloc(void) * Then set directories as appropriate... */ -#ifdef WIN32 +#ifdef _WIN32 if (!installdir[0]) { /* @@ -315,7 +315,7 @@ cups_globals_alloc(void) if ((cg->localedir = getenv("LOCALEDIR")) == NULL) cg->localedir = CUPS_LOCALEDIR; } -#endif /* WIN32 */ +#endif /* _WIN32 */ return (cg); } @@ -325,7 +325,7 @@ cups_globals_alloc(void) * 'cups_globals_free()' - Free global data. */ -#if defined(HAVE_PTHREAD_H) || defined(WIN32) +#if defined(HAVE_PTHREAD_H) || defined(_WIN32) static void cups_globals_free(_cups_globals_t *cg) /* I - Pointer to global data */ { @@ -360,7 +360,7 @@ cups_globals_free(_cups_globals_t *cg) /* I - Pointer to global data */ free(cg); } -#endif /* HAVE_PTHREAD_H || WIN32 */ +#endif /* HAVE_PTHREAD_H || _WIN32 */ #ifdef HAVE_PTHREAD_H diff --git a/cups/http-addr.c b/cups/http-addr.c index 61c86384b2..f8b8131c34 100644 --- a/cups/http-addr.c +++ b/cups/http-addr.c @@ -69,11 +69,11 @@ int /* O - 0 on success, -1 on failure */ httpAddrClose(http_addr_t *addr, /* I - Listen address or @code NULL@ */ int fd) /* I - Socket file descriptor */ { -#ifdef WIN32 +#ifdef _WIN32 if (closesocket(fd)) #else if (close(fd)) -#endif /* WIN32 */ +#endif /* _WIN32 */ return (-1); #ifdef AF_LOCAL @@ -258,9 +258,9 @@ httpAddrListen(http_addr_t *addr, /* I - Address to bind to */ * Close on exec... */ -#ifndef WIN32 +#ifndef _WIN32 fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC); -#endif /* !WIN32 */ +#endif /* !_WIN32 */ #ifdef SO_NOSIGPIPE /* diff --git a/cups/http-addrlist.c b/cups/http-addrlist.c index 3e0f2ca012..a7d5abcfa1 100644 --- a/cups/http-addrlist.c +++ b/cups/http-addrlist.c @@ -24,9 +24,9 @@ #ifdef HAVE_POLL # include #endif /* HAVE_POLL */ -#ifndef WIN32 +#ifndef _WIN32 # include -#endif /* WIN32 */ +#endif /* _WIN32 */ /* @@ -61,9 +61,9 @@ httpAddrConnect2( int *cancel) /* I - Pointer to "cancel" variable */ { int val; /* Socket option value */ -#ifndef WIN32 +#ifndef _WIN32 int flags; /* Socket flags */ -#endif /* !WIN32 */ +#endif /* !_WIN32 */ int remaining; /* Remaining timeout */ int i, j, /* Looping vars */ nfds, /* Number of file descriptors */ @@ -213,11 +213,11 @@ httpAddrConnect2( return (addrlist); } -#ifdef WIN32 +#ifdef _WIN32 if (WSAGetLastError() != WSAEINPROGRESS && WSAGetLastError() != WSAEWOULDBLOCK) #else if (errno != EINPROGRESS && errno != EWOULDBLOCK) -#endif /* WIN32 */ +#endif /* _WIN32 */ { DEBUG_printf(("1httpAddrConnect2: Unable to connect to %s:%d: %s", httpAddrString(&(addrlist->addr), temp, sizeof(temp)), httpAddrPort(&(addrlist->addr)), strerror(errno))); httpAddrClose(NULL, fds[nfds]); @@ -225,9 +225,9 @@ httpAddrConnect2( continue; } -#ifndef WIN32 +#ifndef _WIN32 fcntl(fds[nfds], F_SETFL, flags); -#endif /* !WIN32 */ +#endif /* !_WIN32 */ #ifndef HAVE_POLL if (fds[nfds] > max_fd) @@ -296,11 +296,11 @@ httpAddrConnect2( DEBUG_printf(("1httpAddrConnect2: select() returned %d (%d)", result, errno)); # endif /* HAVE_POLL */ } -# ifdef WIN32 +# ifdef _WIN32 while (result < 0 && (WSAGetLastError() == WSAEINTR || WSAGetLastError() == WSAEWOULDBLOCK)); # else while (result < 0 && (errno == EINTR || errno == EAGAIN)); -# endif /* WIN32 */ +# endif /* _WIN32 */ if (result > 0) { @@ -377,11 +377,11 @@ httpAddrConnect2( httpAddrClose(NULL, fds[nfds]); } -#ifdef WIN32 +#ifdef _WIN32 _cupsSetError(IPP_STATUS_ERROR_SERVICE_UNAVAILABLE, "Connection failed", 0); #else _cupsSetError(IPP_STATUS_ERROR_SERVICE_UNAVAILABLE, strerror(errno), 0); -#endif /* WIN32 */ +#endif /* _WIN32 */ return (NULL); } @@ -849,11 +849,11 @@ httpAddrGetList(const char *hostname, /* I - Hostname, IP address, or NULL for p temp->addr.ipv6.sin6_family = AF_INET6; temp->addr.ipv6.sin6_port = htons(portnum); -# ifdef WIN32 +# ifdef _WIN32 temp->addr.ipv6.sin6_addr.u.Byte[15] = 1; # else temp->addr.ipv6.sin6_addr.s6_addr32[3] = htonl(1); -# endif /* WIN32 */ +# endif /* _WIN32 */ if (!first) first = temp; diff --git a/cups/http-private.h b/cups/http-private.h index be0533c4d1..32cb9ea5b2 100644 --- a/cups/http-private.h +++ b/cups/http-private.h @@ -30,7 +30,7 @@ # endif /* __sun */ # include -# ifdef WIN32 +# ifdef _WIN32 # include # include # define CUPS_SOCAST (const char *) @@ -39,7 +39,7 @@ # include # include # define CUPS_SOCAST -# endif /* WIN32 */ +# endif /* _WIN32 */ # ifdef HAVE_GSSAPI # ifdef HAVE_GSS_GSSAPI_H @@ -140,7 +140,7 @@ extern SecIdentityRef SecIdentityCreate(CFAllocatorRef allocator, SecCertificate # include # endif /* HAVE_GNUTLS */ -# ifndef WIN32 +# ifndef _WIN32 # include # include # ifdef HAVE_GETIFADDRS @@ -151,7 +151,7 @@ extern SecIdentityRef SecIdentityCreate(CFAllocatorRef allocator, SecCertificate # include # endif /* HAVE_SYS_SOCKIO_H */ # endif /* HAVE_GETIFADDRS */ -# endif /* !WIN32 */ +# endif /* !_WIN32 */ /* @@ -392,7 +392,7 @@ extern const char *_cups_hstrerror(int error); * Some OS's don't have getifaddrs() and freeifaddrs()... */ -# if !defined(WIN32) && !defined(HAVE_GETIFADDRS) +# if !defined(_WIN32) && !defined(HAVE_GETIFADDRS) # ifdef ifa_dstaddr # undef ifa_dstaddr # endif /* ifa_dstaddr */ @@ -427,7 +427,7 @@ extern int _cups_getifaddrs(struct ifaddrs **addrs); # define getifaddrs _cups_getifaddrs extern void _cups_freeifaddrs(struct ifaddrs *addrs); # define freeifaddrs _cups_freeifaddrs -# endif /* !WIN32 && !HAVE_GETIFADDRS */ +# endif /* !_WIN32 && !HAVE_GETIFADDRS */ /* diff --git a/cups/http-support.c b/cups/http-support.c index 739953b31d..aff48ab169 100644 --- a/cups/http-support.c +++ b/cups/http-support.c @@ -20,13 +20,13 @@ #include "cups-private.h" #ifdef HAVE_DNSSD # include -# ifdef WIN32 +# ifdef _WIN32 # include # elif defined(HAVE_POLL) # include # else # include -# endif /* WIN32 */ +# endif /* _WIN32 */ #elif defined(HAVE_AVAHI) # include # include @@ -1768,9 +1768,9 @@ _httpResolveURI( _http_uribuf_t uribuf; /* URI buffer */ int offline = 0; /* offline-report state set? */ # ifdef HAVE_DNSSD -# ifdef WIN32 +# ifdef _WIN32 # pragma comment(lib, "dnssd.lib") -# endif /* WIN32 */ +# endif /* _WIN32 */ DNSServiceRef ref, /* DNS-SD master service reference */ domainref = NULL,/* DNS-SD service reference for domain */ ippref = NULL, /* DNS-SD service reference for network IPP */ @@ -1899,11 +1899,11 @@ _httpResolveURI( FD_ZERO(&input_set); FD_SET(DNSServiceRefSockFD(ref), &input_set); -# ifdef WIN32 +# ifdef _WIN32 stimeout.tv_sec = (long)timeout; # else stimeout.tv_sec = timeout; -# endif /* WIN32 */ +# endif /* _WIN32 */ stimeout.tv_usec = 0; fds = select(DNSServiceRefSockFD(ref)+1, &input_set, NULL, NULL, diff --git a/cups/http.c b/cups/http.c index 2fe5ba003b..5c14ef68e1 100644 --- a/cups/http.c +++ b/cups/http.c @@ -23,13 +23,13 @@ #include "cups-private.h" #include #include -#ifdef WIN32 +#ifdef _WIN32 # include #else # include # include # include -#endif /* WIN32 */ +#endif /* _WIN32 */ #ifdef HAVE_POLL # include #endif /* HAVE_POLL */ @@ -1197,11 +1197,11 @@ httpGets(char *line, /* I - Line to read into */ * Pre-load the buffer as needed... */ -#ifdef WIN32 +#ifdef _WIN32 WSASetLastError(0); #else errno = 0; -#endif /* WIN32 */ +#endif /* _WIN32 */ while (http->used == 0) { @@ -1215,11 +1215,11 @@ httpGets(char *line, /* I - Line to read into */ continue; DEBUG_puts("3httpGets: Timed out!"); -#ifdef WIN32 +#ifdef _WIN32 http->error = WSAETIMEDOUT; #else http->error = ETIMEDOUT; -#endif /* WIN32 */ +#endif /* _WIN32 */ return (NULL); } @@ -1233,7 +1233,7 @@ httpGets(char *line, /* I - Line to read into */ * Nope, can't get a line this time... */ -#ifdef WIN32 +#ifdef _WIN32 DEBUG_printf(("3httpGets: recv() error %d!", WSAGetLastError())); if (WSAGetLastError() == WSAEINTR) @@ -1270,7 +1270,7 @@ httpGets(char *line, /* I - Line to read into */ http->error = errno; continue; } -#endif /* WIN32 */ +#endif /* _WIN32 */ return (NULL); } @@ -1537,9 +1537,9 @@ void httpInitialize(void) { static int initialized = 0; /* Have we been called before? */ -#ifdef WIN32 +#ifdef _WIN32 WSADATA winsockdata; /* WinSock data */ -#endif /* WIN32 */ +#endif /* _WIN32 */ _cupsGlobalLock(); @@ -1549,7 +1549,7 @@ httpInitialize(void) return; } -#ifdef WIN32 +#ifdef _WIN32 WSAStartup(MAKEWORD(2,2), &winsockdata); #elif !defined(SO_NOSIGPIPE) @@ -1571,7 +1571,7 @@ httpInitialize(void) # else signal(SIGPIPE, SIG_IGN); # endif /* !SO_NOSIGPIPE */ -#endif /* WIN32 */ +#endif /* _WIN32 */ # ifdef HAVE_SSL _httpTLSInitialize(); @@ -1859,7 +1859,7 @@ httpPeek(http_t *http, /* I - HTTP connection */ if (bytes < 0) { -#ifdef WIN32 +#ifdef _WIN32 if (WSAGetLastError() == WSAEINTR || WSAGetLastError() == WSAEWOULDBLOCK) bytes = 0; else @@ -1869,7 +1869,7 @@ httpPeek(http_t *http, /* I - HTTP connection */ bytes = 0; else http->error = errno; -#endif /* WIN32 */ +#endif /* _WIN32 */ } else if (bytes == 0) { @@ -2430,11 +2430,11 @@ httpReconnect2(http_t *http, /* I - HTTP connection */ * Unable to connect... */ -#ifdef WIN32 +#ifdef _WIN32 http->error = WSAGetLastError(); #else http->error = errno; -#endif /* WIN32 */ +#endif /* _WIN32 */ http->status = HTTP_STATUS_ERROR; DEBUG_printf(("1httpReconnect2: httpAddrConnect failed: %s", @@ -2771,11 +2771,11 @@ httpShutdown(http_t *http) /* I - HTTP connection */ _httpTLSStop(http); #endif /* HAVE_SSL */ -#ifdef WIN32 +#ifdef _WIN32 shutdown(http->fd, SD_RECEIVE); /* Microsoft-ism... */ #else shutdown(http->fd, SHUT_RD); -#endif /* WIN32 */ +#endif /* _WIN32 */ } @@ -3109,12 +3109,12 @@ _httpWait(http_t *http, /* I - HTTP connection */ DEBUG_printf(("6_httpWait: select() returned %d...", nfds)); } -# ifdef WIN32 +# ifdef _WIN32 while (nfds < 0 && (WSAGetLastError() == WSAEINTR || WSAGetLastError() == WSAEWOULDBLOCK)); # else while (nfds < 0 && (errno == EINTR || errno == EAGAIN)); -# endif /* WIN32 */ +# endif /* _WIN32 */ #endif /* HAVE_POLL */ DEBUG_printf(("5_httpWait: returning with nfds=%d, errno=%d...", nfds, @@ -4149,7 +4149,7 @@ http_read(http_t *http, /* I - HTTP connection */ if (bytes < 0) { -#ifdef WIN32 +#ifdef _WIN32 if (WSAGetLastError() != WSAEINTR) { http->error = WSAGetLastError(); @@ -4185,7 +4185,7 @@ http_read(http_t *http, /* I - HTTP connection */ http->error = errno; return (-1); } -#endif /* WIN32 */ +#endif /* _WIN32 */ } } while (bytes < 0); @@ -4199,7 +4199,7 @@ http_read(http_t *http, /* I - HTTP connection */ if (bytes < 0) { -#ifdef WIN32 +#ifdef _WIN32 if (WSAGetLastError() == WSAEINTR) bytes = 0; else @@ -4209,7 +4209,7 @@ http_read(http_t *http, /* I - HTTP connection */ bytes = 0; else http->error = errno; -#endif /* WIN32 */ +#endif /* _WIN32 */ } else if (bytes == 0) { @@ -4573,7 +4573,7 @@ static void http_set_timeout(int fd, /* I - File descriptor */ double timeout) /* I - Timeout in seconds */ { -#ifdef WIN32 +#ifdef _WIN32 DWORD tv = (DWORD)(timeout * 1000); /* Timeout in milliseconds */ @@ -4588,7 +4588,7 @@ http_set_timeout(int fd, /* I - File descriptor */ setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, CUPS_SOCAST &tv, sizeof(tv)); setsockopt(fd, SOL_SOCKET, SO_SNDTIMEO, CUPS_SOCAST &tv, sizeof(tv)); -#endif /* WIN32 */ +#endif /* _WIN32 */ } @@ -4750,12 +4750,12 @@ http_write(http_t *http, /* I - HTTP connection */ nfds = select(http->fd + 1, NULL, &output_set, NULL, &timeout); } -# ifdef WIN32 +# ifdef _WIN32 while (nfds < 0 && (WSAGetLastError() == WSAEINTR || WSAGetLastError() == WSAEWOULDBLOCK)); # else while (nfds < 0 && (errno == EINTR || errno == EAGAIN)); -# endif /* WIN32 */ +# endif /* _WIN32 */ #endif /* HAVE_POLL */ if (nfds < 0) @@ -4765,11 +4765,11 @@ http_write(http_t *http, /* I - HTTP connection */ } else if (nfds == 0 && (!http->timeout_cb || !(*http->timeout_cb)(http, http->timeout_data))) { -#ifdef WIN32 +#ifdef _WIN32 http->error = WSAEWOULDBLOCK; #else http->error = EWOULDBLOCK; -#endif /* WIN32 */ +#endif /* _WIN32 */ return (-1); } } @@ -4788,7 +4788,7 @@ http_write(http_t *http, /* I - HTTP connection */ if (bytes < 0) { -#ifdef WIN32 +#ifdef _WIN32 if (WSAGetLastError() == WSAEINTR) continue; else if (WSAGetLastError() == WSAEWOULDBLOCK) @@ -4822,7 +4822,7 @@ http_write(http_t *http, /* I - HTTP connection */ http->error = errno; continue; } -#endif /* WIN32 */ +#endif /* _WIN32 */ DEBUG_printf(("3http_write: error writing data (%s).", strerror(http->error))); diff --git a/cups/http.h b/cups/http.h index fec4dc5aa7..9cc55e9187 100644 --- a/cups/http.h +++ b/cups/http.h @@ -25,7 +25,7 @@ # include # include # include -# ifdef WIN32 +# ifdef _WIN32 # ifndef __CUPS_SSIZE_T_DEFINED # define __CUPS_SSIZE_T_DEFINED /* Windows does not support the ssize_t type, so map it to off_t... */ @@ -54,7 +54,7 @@ typedef off_t ssize_t; /* @private@ */ # if defined(LOCAL_PEERCRED) && !defined(SO_PEERCRED) # define SO_PEERCRED LOCAL_PEERCRED # endif /* LOCAL_PEERCRED && !SO_PEERCRED */ -# endif /* WIN32 */ +# endif /* _WIN32 */ /* @@ -85,7 +85,7 @@ extern "C" { # define s6_addr32 _S6_un._S6_u32 # elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__)|| defined(__DragonFly__) # define s6_addr32 __u6_addr.__u6_addr32 -# elif defined(WIN32) +# elif defined(_WIN32) /* * Windows only defines byte and 16-bit word members of the union and * requires special casing of all raw address code... diff --git a/cups/ipp.c b/cups/ipp.c index b243b35058..ddec3a958e 100644 --- a/cups/ipp.c +++ b/cups/ipp.c @@ -19,9 +19,9 @@ #include "cups-private.h" #include -#ifdef WIN32 +#ifdef _WIN32 # include -#endif /* WIN32 */ +#endif /* _WIN32 */ /* @@ -6762,14 +6762,14 @@ ipp_read_http(http_t *http, /* I - Client connection */ if ((bytes = httpRead2(http, (char *)buffer, length - (size_t)tbytes)) < 0) { -#ifdef WIN32 +#ifdef _WIN32 break; #else if (errno != EAGAIN && errno != EINTR) break; bytes = 0; -#endif /* WIN32 */ +#endif /* _WIN32 */ } else if (bytes == 0) break; @@ -6797,11 +6797,11 @@ ipp_read_file(int *fd, /* I - File descriptor */ ipp_uchar_t *buffer, /* O - Read buffer */ size_t length) /* I - Number of bytes to read */ { -#ifdef WIN32 +#ifdef _WIN32 return ((ssize_t)read(*fd, buffer, (unsigned)length)); #else return (read(*fd, buffer, length)); -#endif /* WIN32 */ +#endif /* _WIN32 */ } @@ -6969,9 +6969,9 @@ ipp_write_file(int *fd, /* I - File descriptor */ ipp_uchar_t *buffer, /* I - Data to write */ size_t length) /* I - Number of bytes to write */ { -#ifdef WIN32 +#ifdef _WIN32 return ((ssize_t)write(*fd, buffer, (unsigned)length)); #else return (write(*fd, buffer, length)); -#endif /* WIN32 */ +#endif /* _WIN32 */ } diff --git a/cups/language.c b/cups/language.c index e6d2d44aad..61280c0fb7 100644 --- a/cups/language.c +++ b/cups/language.c @@ -21,11 +21,11 @@ #ifdef HAVE_LANGINFO_H # include #endif /* HAVE_LANGINFO_H */ -#ifdef WIN32 +#ifdef _WIN32 # include #else # include -#endif /* WIN32 */ +#endif /* _WIN32 */ #ifdef HAVE_COREFOUNDATION_H # include #endif /* HAVE_COREFOUNDATION_H */ diff --git a/cups/ppd-emit.c b/cups/ppd-emit.c index 36e5bcaf48..4b153aca69 100644 --- a/cups/ppd-emit.c +++ b/cups/ppd-emit.c @@ -21,11 +21,11 @@ #include "cups-private.h" #include "ppd.h" -#if defined(WIN32) || defined(__EMX__) +#if defined(_WIN32) || defined(__EMX__) # include #else # include -#endif /* WIN32 || __EMX__ */ +#endif /* _WIN32 || __EMX__ */ /* @@ -328,11 +328,11 @@ ppdEmitFd(ppd_file_t *ppd, /* I - PPD file record */ while (buflength > 0) { -#ifdef WIN32 +#ifdef _WIN32 if ((bytes = (ssize_t)write(fd, bufptr, (unsigned)buflength)) < 0) #else if ((bytes = write(fd, bufptr, buflength)) < 0) -#endif /* WIN32 */ +#endif /* _WIN32 */ { if (errno == EAGAIN || errno == EINTR) continue; diff --git a/cups/ppd-util.c b/cups/ppd-util.c index 19c60e271f..0974bae923 100644 --- a/cups/ppd-util.c +++ b/cups/ppd-util.c @@ -21,11 +21,11 @@ #include "ppd-private.h" #include #include -#if defined(WIN32) || defined(__EMX__) +#if defined(_WIN32) || defined(__EMX__) # include #else # include -#endif /* WIN32 || __EMX__ */ +#endif /* _WIN32 || __EMX__ */ /* @@ -171,7 +171,7 @@ cupsGetPPD3(http_t *http, /* I - HTTP connection or @code CUPS_HTTP_DEFAUL return (HTTP_STATUS_NOT_ACCEPTABLE); } -#ifndef WIN32 +#ifndef _WIN32 /* * See if the PPD file is available locally... */ @@ -298,7 +298,7 @@ cupsGetPPD3(http_t *http, /* I - HTTP connection or @code CUPS_HTTP_DEFAUL } } } -#endif /* !WIN32 */ +#endif /* !_WIN32 */ /* * Try finding a printer URI for this printer... diff --git a/cups/ppd.c b/cups/ppd.c index 276e8485e1..5f27484aa6 100644 --- a/cups/ppd.c +++ b/cups/ppd.c @@ -94,9 +94,9 @@ static ppd_group_t *ppd_get_group(ppd_file_t *ppd, const char *name, cups_encoding_t encoding); static ppd_option_t *ppd_get_option(ppd_group_t *group, const char *name); static _ppd_globals_t *ppd_globals_alloc(void); -#if defined(HAVE_PTHREAD_H) || defined(WIN32) +#if defined(HAVE_PTHREAD_H) || defined(_WIN32) static void ppd_globals_free(_ppd_globals_t *g); -#endif /* HAVE_PTHREAD_H || WIN32 */ +#endif /* HAVE_PTHREAD_H || _WIN32 */ #ifdef HAVE_PTHREAD_H static void ppd_globals_init(void); #endif /* HAVE_PTHREAD_H */ @@ -2837,13 +2837,13 @@ ppd_globals_alloc(void) * 'ppd_globals_free()' - Free global data. */ -#if defined(HAVE_PTHREAD_H) || defined(WIN32) +#if defined(HAVE_PTHREAD_H) || defined(_WIN32) static void ppd_globals_free(_ppd_globals_t *pg) /* I - Pointer to global data */ { free(pg); } -#endif /* HAVE_PTHREAD_H || WIN32 */ +#endif /* HAVE_PTHREAD_H || _WIN32 */ #ifdef HAVE_PTHREAD_H diff --git a/cups/raster-private.h b/cups/raster-private.h index 38135815c1..86bd7e793b 100644 --- a/cups/raster-private.h +++ b/cups/raster-private.h @@ -24,13 +24,13 @@ # include # include # include -# ifdef WIN32 +# ifdef _WIN32 # include # include /* for htonl() definition */ # else # include # include -# endif /* WIN32 */ +# endif /* _WIN32 */ /* diff --git a/cups/request.c b/cups/request.c index 16c30e86a5..a4e4b90533 100644 --- a/cups/request.c +++ b/cups/request.c @@ -20,11 +20,11 @@ #include "cups-private.h" #include #include -#if defined(WIN32) || defined(__EMX__) +#if defined(_WIN32) || defined(__EMX__) # include #else # include -#endif /* WIN32 || __EMX__ */ +#endif /* _WIN32 || __EMX__ */ #ifndef O_BINARY # define O_BINARY 0 #endif /* O_BINARY */ @@ -156,11 +156,11 @@ cupsDoIORequest(http_t *http, /* I - Connection to server or @code CUPS_HTTP return (NULL); } -#ifdef WIN32 +#ifdef _WIN32 if (fileinfo.st_mode & _S_IFDIR) #else if (S_ISDIR(fileinfo.st_mode)) -#endif /* WIN32 */ +#endif /* _WIN32 */ { /* * Can't send a directory... @@ -172,11 +172,11 @@ cupsDoIORequest(http_t *http, /* I - Connection to server or @code CUPS_HTTP return (NULL); } -#ifndef WIN32 +#ifndef _WIN32 if (!S_ISREG(fileinfo.st_mode)) length = 0; /* Chunk when piping */ else -#endif /* !WIN32 */ +#endif /* !_WIN32 */ length = ippLength(request) + (size_t)fileinfo.st_size; } else @@ -215,9 +215,9 @@ cupsDoIORequest(http_t *http, /* I - Connection to server or @code CUPS_HTTP * Send the file with the request... */ -#ifndef WIN32 +#ifndef _WIN32 if (S_ISREG(fileinfo.st_mode)) -#endif /* WIN32 */ +#endif /* _WIN32 */ lseek(infile, 0, SEEK_SET); while ((bytes = read(infile, buffer, sizeof(buffer))) > 0) @@ -1028,13 +1028,13 @@ _cupsConnect(void) char ch; /* Connection check byte */ ssize_t n; /* Number of bytes */ -#ifdef WIN32 +#ifdef _WIN32 if ((n = recv(cg->http->fd, &ch, 1, MSG_PEEK)) == 0 || (n < 0 && WSAGetLastError() != WSAEWOULDBLOCK)) #else if ((n = recv(cg->http->fd, &ch, 1, MSG_PEEK | MSG_DONTWAIT)) == 0 || (n < 0 && errno != EWOULDBLOCK)) -#endif /* WIN32 */ +#endif /* _WIN32 */ { /* * Nope, close the connection... diff --git a/cups/sidechannel.c b/cups/sidechannel.c index a4cd960aa2..f2dbabd691 100644 --- a/cups/sidechannel.c +++ b/cups/sidechannel.c @@ -19,15 +19,15 @@ #include "sidechannel.h" #include "cups-private.h" -#ifdef WIN32 +#ifdef _WIN32 # include #else # include -#endif /* WIN32 */ -#ifndef WIN32 +#endif /* _WIN32 */ +#ifndef _WIN32 # include # include -#endif /* !WIN32 */ +#endif /* !_WIN32 */ #ifdef HAVE_POLL # include #endif /* HAVE_POLL */ diff --git a/cups/snmp.c b/cups/snmp.c index 7958b93e55..8437528dd0 100644 --- a/cups/snmp.c +++ b/cups/snmp.c @@ -395,11 +395,11 @@ _cupsSNMPRead(int fd, /* I - SNMP socket file descriptor */ ready = select(fd + 1, &input_set, NULL, NULL, &stimeout); } -# ifdef WIN32 +# ifdef _WIN32 while (ready < 0 && WSAGetLastError() == WSAEINTR); # else while (ready < 0 && (errno == EINTR || errno == EAGAIN)); -# endif /* WIN32 */ +# endif /* _WIN32 */ #endif /* HAVE_POLL */ /* diff --git a/cups/string-private.h b/cups/string-private.h index e8448d17f1..53201f7c43 100644 --- a/cups/string-private.h +++ b/cups/string-private.h @@ -42,12 +42,12 @@ # include # endif /* HAVE_BSTRING_H */ -# if defined(WIN32) && !defined(__CUPS_SSIZE_T_DEFINED) +# if defined(_WIN32) && !defined(__CUPS_SSIZE_T_DEFINED) # define __CUPS_SSIZE_T_DEFINED # include /* Windows does not support the ssize_t type, so map it to long... */ typedef long ssize_t; /* @private@ */ -# endif /* WIN32 && !__CUPS_SSIZE_T_DEFINED */ +# endif /* _WIN32 && !__CUPS_SSIZE_T_DEFINED */ /* diff --git a/cups/tempfile.c b/cups/tempfile.c index 1e248694c8..7b341e13f9 100644 --- a/cups/tempfile.c +++ b/cups/tempfile.c @@ -21,11 +21,11 @@ #include #include #include -#if defined(WIN32) || defined(__EMX__) +#if defined(_WIN32) || defined(__EMX__) # include #else # include -#endif /* WIN32 || __EMX__ */ +#endif /* _WIN32 || __EMX__ */ /* @@ -42,21 +42,21 @@ cupsTempFd(char *filename, /* I - Pointer to buffer */ int fd; /* File descriptor for temp file */ int tries; /* Number of tries */ const char *tmpdir; /* TMPDIR environment var */ -#if defined(__APPLE__) || defined(WIN32) +#if defined(__APPLE__) || defined(_WIN32) char tmppath[1024]; /* Temporary directory */ -#endif /* __APPLE__ || WIN32 */ -#ifdef WIN32 +#endif /* __APPLE__ || _WIN32 */ +#ifdef _WIN32 DWORD curtime; /* Current time */ #else struct timeval curtime; /* Current time */ -#endif /* WIN32 */ +#endif /* _WIN32 */ /* * See if TMPDIR is defined... */ -#ifdef WIN32 +#ifdef _WIN32 if ((tmpdir = getenv("TEMP")) == NULL) { GetTempPath(sizeof(tmppath), tmppath); @@ -92,7 +92,7 @@ cupsTempFd(char *filename, /* I - Pointer to buffer */ if ((tmpdir = getenv("TMPDIR")) == NULL) tmpdir = "/tmp"; -#endif /* WIN32 */ +#endif /* _WIN32 */ /* * Make the temporary name using the specified directory... @@ -102,7 +102,7 @@ cupsTempFd(char *filename, /* I - Pointer to buffer */ do { -#ifdef WIN32 +#ifdef _WIN32 /* * Get the current time of day... */ @@ -126,21 +126,21 @@ cupsTempFd(char *filename, /* I - Pointer to buffer */ */ snprintf(filename, (size_t)len - 1, "%s/%05x%08x", tmpdir, (unsigned)getpid(), (unsigned)(curtime.tv_sec + curtime.tv_usec + tries)); -#endif /* WIN32 */ +#endif /* _WIN32 */ /* * Open the file in "exclusive" mode, making sure that we don't * stomp on an existing file or someone's symlink crack... */ -#ifdef WIN32 +#ifdef _WIN32 fd = open(filename, _O_CREAT | _O_RDWR | _O_TRUNC | _O_BINARY, _S_IREAD | _S_IWRITE); #elif defined(O_NOFOLLOW) fd = open(filename, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW, 0600); #else fd = open(filename, O_RDWR | O_CREAT | O_EXCL, 0600); -#endif /* WIN32 */ +#endif /* _WIN32 */ if (fd < 0 && errno != EEXIST) break; diff --git a/cups/testarray.c b/cups/testarray.c index 6164ffc665..892e325072 100644 --- a/cups/testarray.c +++ b/cups/testarray.c @@ -494,7 +494,7 @@ main(void) * 'get_seconds()' - Get the current time in seconds... */ -#ifdef WIN32 +#ifdef _WIN32 # include @@ -515,7 +515,7 @@ get_seconds(void) gettimeofday(&curtime, NULL); return (curtime.tv_sec + 0.000001 * curtime.tv_usec); } -#endif /* WIN32 */ +#endif /* _WIN32 */ /* diff --git a/cups/testfile.c b/cups/testfile.c index 6e1256b7fb..1473a4a039 100644 --- a/cups/testfile.c +++ b/cups/testfile.c @@ -22,11 +22,11 @@ #include "file.h" #include #include -#ifdef WIN32 +#ifdef _WIN32 # include #else # include -#endif /* WIN32 */ +#endif /* _WIN32 */ #include @@ -50,10 +50,10 @@ main(int argc, /* I - Number of command-line arguments */ int status; /* Exit status */ char filename[1024]; /* Filename buffer */ cups_file_t *fp; /* File pointer */ -#ifndef WIN32 +#ifndef _WIN32 int fds[2]; /* Open file descriptors */ cups_file_t *fdfile; /* File opened with cupsFileOpenFd() */ -#endif /* !WIN32 */ +#endif /* !_WIN32 */ int count; /* Number of lines in file */ @@ -81,7 +81,7 @@ main(int argc, /* I - Number of command-line arguments */ status += random_tests(); -#ifndef WIN32 +#ifndef _WIN32 /* * Test fdopen and close without reading... */ @@ -115,7 +115,7 @@ main(int argc, /* I - Number of command-line arguments */ puts("PASS"); } -#endif /* !WIN32 */ +#endif /* !_WIN32 */ /* * Count lines in psglyphs, rewind, then count again. @@ -171,13 +171,13 @@ main(int argc, /* I - Number of command-line arguments */ */ fputs("\ncupsFileFind: ", stdout); -#ifdef WIN32 +#ifdef _WIN32 if (cupsFileFind("notepad.exe", "C:/WINDOWS", 1, filename, sizeof(filename)) && cupsFileFind("notepad.exe", "C:/WINDOWS;C:/WINDOWS/SYSTEM32", 1, filename, sizeof(filename))) #else if (cupsFileFind("cat", "/bin", 1, filename, sizeof(filename)) && cupsFileFind("cat", "/bin:/usr/bin", 1, filename, sizeof(filename))) -#endif /* WIN32 */ +#endif /* _WIN32 */ printf("PASS (%s)\n", filename); else { diff --git a/cups/testipp.c b/cups/testipp.c index ea8f9d78ce..2ef2496ebc 100644 --- a/cups/testipp.c +++ b/cups/testipp.c @@ -20,12 +20,12 @@ #include "file.h" #include "string-private.h" #include "ipp-private.h" -#ifdef WIN32 +#ifdef _WIN32 # include #else # include # include -#endif /* WIN32 */ +#endif /* _WIN32 */ /* diff --git a/cups/testppd.c b/cups/testppd.c index c7187c212d..a127a7947e 100644 --- a/cups/testppd.c +++ b/cups/testppd.c @@ -21,12 +21,12 @@ #include "cups-private.h" #include "ppd-private.h" #include -#ifdef WIN32 +#ifdef _WIN32 # include #else # include # include -#endif /* WIN32 */ +#endif /* _WIN32 */ #include diff --git a/cups/thread-private.h b/cups/thread-private.h index 79d2438679..ae8163d1c1 100644 --- a/cups/thread-private.h +++ b/cups/thread-private.h @@ -46,7 +46,7 @@ typedef pthread_key_t _cups_threadkey_t; # define _cupsThreadGetData(k) pthread_getspecific(k) # define _cupsThreadSetData(k,p) pthread_setspecific(k,p) -# elif defined(WIN32) /* Windows threading */ +# elif defined(_WIN32) /* Windows threading */ # include # include typedef void *(__stdcall *_cups_thread_func_t)(void *arg); diff --git a/cups/thread.c b/cups/thread.c index b59918b39e..7ffc2ec073 100644 --- a/cups/thread.c +++ b/cups/thread.c @@ -208,7 +208,7 @@ _cupsThreadWait(_cups_thread_t thread) /* I - Thread ID */ } -#elif defined(WIN32) +#elif defined(_WIN32) # include diff --git a/cups/tls.c b/cups/tls.c index f3dd092c42..2539a090a0 100644 --- a/cups/tls.c +++ b/cups/tls.c @@ -23,13 +23,13 @@ #include "cups-private.h" #include #include -#ifdef WIN32 +#ifdef _WIN32 # include #else # include # include # include -#endif /* WIN32 */ +#endif /* _WIN32 */ #ifdef HAVE_POLL # include #endif /* HAVE_POLL */ diff --git a/cups/usersys.c b/cups/usersys.c index 99601e4c44..781f27bbe2 100644 --- a/cups/usersys.c +++ b/cups/usersys.c @@ -20,13 +20,13 @@ #include "cups-private.h" #include #include -#ifdef WIN32 +#ifdef _WIN32 # include #else # include # include # include -#endif /* WIN32 */ +#endif /* _WIN32 */ /* @@ -490,12 +490,12 @@ cupsSetUserAgent(const char *user_agent)/* I - User-Agent string or @code NULL@ { _cups_globals_t *cg = _cupsGlobals(); /* Thread globals */ -#ifdef WIN32 +#ifdef _WIN32 SYSTEM_INFO sysinfo; /* System information */ OSVERSIONINFO version; /* OS version info */ #else struct utsname name; /* uname info */ -#endif /* WIN32 */ +#endif /* _WIN32 */ if (user_agent) @@ -504,7 +504,7 @@ cupsSetUserAgent(const char *user_agent)/* I - User-Agent string or @code NULL@ return; } -#ifdef WIN32 +#ifdef _WIN32 version.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); GetVersionEx(&version); GetNativeSystemInfo(&sysinfo); @@ -528,7 +528,7 @@ cupsSetUserAgent(const char *user_agent)/* I - User-Agent string or @code NULL@ snprintf(cg->user_agent, sizeof(cg->user_agent), CUPS_MINIMAL " (%s %s; %s) IPP/2.0", name.sysname, name.release, name.machine); -#endif /* WIN32 */ +#endif /* _WIN32 */ } @@ -580,7 +580,7 @@ cupsUserAgent(void) const char * /* O - Password or @code NULL@ if none */ _cupsGetPassword(const char *prompt) /* I - Prompt string */ { -#ifdef WIN32 +#ifdef _WIN32 HANDLE tty; /* Console handle */ DWORD mode; /* Console mode */ char passch, /* Current key press */ @@ -846,7 +846,7 @@ _cupsGetPassword(const char *prompt) /* I - Prompt string */ memset(cg->password, 0, sizeof(cg->password)); return (NULL); } -#endif /* WIN32 */ +#endif /* _WIN32 */ } @@ -905,7 +905,7 @@ _cupsSetDefaults(void) # ifdef HAVE_GETEUID if ((geteuid() == getuid() || !getuid()) && getegid() == getgid() && (home = getenv("HOME")) != NULL) -# elif !defined(WIN32) +# elif !defined(_WIN32) if (getuid() && (home = getenv("HOME")) != NULL) # else if ((home = getenv("HOME")) != NULL) @@ -1101,7 +1101,7 @@ cups_finalize_client_conf( if (!cc->user[0]) { -#ifdef WIN32 +#ifdef _WIN32 /* * Get the current user name from the OS... */ @@ -1137,7 +1137,7 @@ cups_finalize_client_conf( if (pw) strlcpy(cc->user, pw->pw_name, sizeof(cc->user)); else -#endif /* WIN32 */ +#endif /* _WIN32 */ { /* * Use the default "unknown" user name... diff --git a/cups/util.c b/cups/util.c index e800449ca8..ef1709c57d 100644 --- a/cups/util.c +++ b/cups/util.c @@ -20,11 +20,11 @@ #include "cups-private.h" #include #include -#if defined(WIN32) || defined(__EMX__) +#if defined(_WIN32) || defined(__EMX__) # include #else # include -#endif /* WIN32 || __EMX__ */ +#endif /* _WIN32 || __EMX__ */ /* diff --git a/filter/raster.c b/filter/raster.c index edb650dfcc..3ff0300853 100644 --- a/filter/raster.c +++ b/filter/raster.c @@ -2132,11 +2132,11 @@ cups_read_fd(void *ctx, /* I - File descriptor as pointer */ ssize_t count; /* Number of bytes read */ -#ifdef WIN32 /* Sigh */ +#ifdef _WIN32 /* Sigh */ while ((count = read(fd, buf, (unsigned)bytes)) < 0) #else while ((count = read(fd, buf, bytes)) < 0) -#endif /* WIN32 */ +#endif /* _WIN32 */ if (errno != EINTR && errno != EAGAIN) { DEBUG_printf(("8cups_read_fd: %s", strerror(errno))); @@ -2213,11 +2213,11 @@ cups_write_fd(void *ctx, /* I - File descriptor pointer */ ssize_t count; /* Number of bytes written */ -#ifdef WIN32 /* Sigh */ +#ifdef _WIN32 /* Sigh */ while ((count = write(fd, buf, (unsigned)bytes)) < 0) #else while ((count = write(fd, buf, bytes)) < 0) -#endif /* WIN32 */ +#endif /* _WIN32 */ if (errno != EINTR && errno != EAGAIN) { DEBUG_printf(("8cups_write_fd: %s", strerror(errno))); diff --git a/ppdc/ppdc-source.cxx b/ppdc/ppdc-source.cxx index aa2542c566..5add81002f 100644 --- a/ppdc/ppdc-source.cxx +++ b/ppdc/ppdc-source.cxx @@ -23,9 +23,9 @@ #include "data/epson.h" #include "data/hp.h" #include "data/label.h" -#ifndef WIN32 +#ifndef _WIN32 # include -#endif // !WIN32 +#endif // !_WIN32 // @@ -73,7 +73,7 @@ ppdcSource::ppdcSource(const char *f, // I - File to read vars->add(new ppdcVariable("CUPS_VERSION_MINOR", MAKE_STRING(CUPS_VERSION_MINOR))); vars->add(new ppdcVariable("CUPS_VERSION_PATCH", MAKE_STRING(CUPS_VERSION_PATCH))); -#ifdef WIN32 +#ifdef _WIN32 vars->add(new ppdcVariable("PLATFORM_NAME", "Windows")); vars->add(new ppdcVariable("PLATFORM_ARCH", "X86")); @@ -90,7 +90,7 @@ ppdcSource::ppdcSource(const char *f, // I - File to read vars->add(new ppdcVariable("PLATFORM_NAME", "unknown")); vars->add(new ppdcVariable("PLATFORM_ARCH", "unknown")); } -#endif // WIN32 +#endif // _WIN32 if (f) read_file(f, ffp); diff --git a/scheduler/cupsd.h b/scheduler/cupsd.h index ad37bee436..08e1abebd8 100644 --- a/scheduler/cupsd.h +++ b/scheduler/cupsd.h @@ -30,11 +30,11 @@ #include #include -#ifdef WIN32 +#ifdef _WIN32 # include #else # include -#endif /* WIN32 */ +#endif /* _WIN32 */ #include "mime.h" diff --git a/scheduler/type.c b/scheduler/type.c index d1b0a415bb..3ff1951cd9 100644 --- a/scheduler/type.c +++ b/scheduler/type.c @@ -1087,7 +1087,7 @@ mime_check_rules( break; case MIME_MAGIC_LOCALE : -#if defined(WIN32) || defined(__EMX__) || defined(__APPLE__) +#if defined(_WIN32) || defined(__EMX__) || defined(__APPLE__) result = !strcmp(rules->value.localev, setlocale(LC_ALL, "")); #else result = !strcmp(rules->value.localev, setlocale(LC_MESSAGES, "")); diff --git a/systemv/cupstestppd.c b/systemv/cupstestppd.c index 9344c51eed..d9a2f74ef9 100644 --- a/systemv/cupstestppd.c +++ b/systemv/cupstestppd.c @@ -24,9 +24,9 @@ #include #include #include -#ifdef WIN32 +#ifdef _WIN32 # define X_OK 0 -#endif /* WIN32 */ +#endif /* _WIN32 */ /* diff --git a/test/ippfind.c b/test/ippfind.c index 2c938733ea..8687d053fb 100644 --- a/test/ippfind.c +++ b/test/ippfind.c @@ -20,12 +20,12 @@ #define _CUPS_NO_DEPRECATED #include -#ifdef WIN32 +#ifdef _WIN32 # include # include #else # include -#endif /* WIN32 */ +#endif /* _WIN32 */ #include #ifdef HAVE_DNSSD # include @@ -39,9 +39,9 @@ # define kDNSServiceMaxDomainName AVAHI_DOMAIN_NAME_MAX #endif /* HAVE_DNSSD */ -#ifndef WIN32 +#ifndef _WIN32 extern char **environ; /* Process environment variables */ -#endif /* !WIN32 */ +#endif /* !_WIN32 */ /* @@ -1766,10 +1766,10 @@ dnssd_error_string(int error) /* I - Error number */ case kDNSServiceErr_PollingMode : return ("Service polling mode error."); -#ifndef WIN32 +#ifndef _WIN32 case kDNSServiceErr_Timeout : return ("Service timeout."); -#endif /* !WIN32 */ +#endif /* !_WIN32 */ } # elif defined(HAVE_AVAHI) @@ -1920,10 +1920,10 @@ exec_program(ippfind_srv_t *service, /* I - Service */ int i, /* Looping var */ myenvc, /* Number of environment variables */ status; /* Exit status of program */ -#ifndef WIN32 +#ifndef _WIN32 char program[1024]; /* Program to execute */ int pid; /* Process ID */ -#endif /* !WIN32 */ +#endif /* !_WIN32 */ /* @@ -2058,7 +2058,7 @@ exec_program(ippfind_srv_t *service, /* I - Service */ myargv[i] = strdup(args[i]); } -#ifdef WIN32 +#ifdef _WIN32 if (getenv("IPPFIND_DEBUG")) { printf("\nProgram:\n %s\n", args[0]); @@ -2121,7 +2121,7 @@ exec_program(ippfind_srv_t *service, /* I - Service */ while (wait(&status) != pid) ; } -#endif /* WIN32 */ +#endif /* _WIN32 */ /* * Free memory... @@ -2139,14 +2139,14 @@ exec_program(ippfind_srv_t *service, /* I - Service */ if (getenv("IPPFIND_DEBUG")) { -#ifdef WIN32 +#ifdef _WIN32 printf("Exit Status: %d\n", status); #else if (WIFEXITED(status)) printf("Exit Status: %d\n", WEXITSTATUS(status)); else printf("Terminating Signal: %d\n", WTERMSIG(status)); -#endif /* WIN32 */ +#endif /* _WIN32 */ } return (status == 0); @@ -2220,7 +2220,7 @@ get_service(cups_array_t *services, /* I - Service array */ static double get_time(void) { -#ifdef WIN32 +#ifdef _WIN32 struct _timeb curtime; /* Current Windows time */ _ftime(&curtime); @@ -2234,7 +2234,7 @@ get_time(void) return (0.0); else return (curtime.tv_sec + 0.000001 * curtime.tv_usec); -#endif /* WIN32 */ +#endif /* _WIN32 */ } diff --git a/test/ippserver.c b/test/ippserver.c index 38b304f808..c35c5e6abd 100644 --- a/test/ippserver.c +++ b/test/ippserver.c @@ -37,7 +37,7 @@ #include #include -#ifdef WIN32 +#ifdef _WIN32 # include # include # include @@ -51,7 +51,7 @@ extern char **environ; # include # include # include -#endif /* WIN32 */ +#endif /* _WIN32 */ #ifdef HAVE_DNSSD # include @@ -652,7 +652,7 @@ main(int argc, /* I - Number of command-line args */ if (!port) { -#ifdef WIN32 +#ifdef _WIN32 /* * Windows is almost always used as a single user system, so use a default * port number of 8631. @@ -666,7 +666,7 @@ main(int argc, /* I - Number of command-line args */ */ port = 8000 + ((int)getuid() % 1000); -#endif /* WIN32 */ +#endif /* _WIN32 */ fprintf(stderr, "Listening on port %d.\n", port); } @@ -675,7 +675,7 @@ main(int argc, /* I - Number of command-line args */ { const char *tmpdir; /* Temporary directory */ -#ifdef WIN32 +#ifdef _WIN32 if ((tmpdir = getenv("TEMP")) == NULL) tmpdir = "C:/TEMP"; #elif defined(__APPLE__) && !TARGET_OS_IOS @@ -684,7 +684,7 @@ main(int argc, /* I - Number of command-line args */ #else if ((tmpdir = getenv("TMPDIR")) == NULL) tmpdir = "/tmp"; -#endif /* WIN32 */ +#endif /* _WIN32 */ snprintf(directory, sizeof(directory), "%s/ippserver.%d", tmpdir, (int)getpid()); @@ -1280,9 +1280,9 @@ create_printer(const char *servername, /* I - Server hostname (NULL for default) { int i, j; /* Looping vars */ _ipp_printer_t *printer; /* Printer */ -#ifndef WIN32 +#ifndef _WIN32 char path[1024]; /* Full path to command */ -#endif /* !WIN32 */ +#endif /* !_WIN32 */ char uri[1024], /* Printer URI */ #ifdef HAVE_SSL securi[1024], /* Secure printer URI */ @@ -1484,7 +1484,7 @@ create_printer(const char *servername, /* I - Server hostname (NULL for default) }; -#ifndef WIN32 +#ifndef _WIN32 /* * If a command was specified, make sure it exists and is executable... */ @@ -1510,7 +1510,7 @@ create_printer(const char *servername, /* I - Server hostname (NULL for default) command = path; } } -#endif /* !WIN32 */ +#endif /* !_WIN32 */ /* * Allocate memory for the printer... @@ -2481,9 +2481,9 @@ filter_cb(_ipp_filter_t *filter, /* I - Filter parameters */ * Filter attributes as needed... */ -#ifndef WIN32 /* Avoid MS compiler bug */ +#ifndef _WIN32 /* Avoid MS compiler bug */ (void)dst; -#endif /* !WIN32 */ +#endif /* !_WIN32 */ ipp_tag_t group = ippGetGroupTag(attr); const char *name = ippGetName(attr); @@ -6032,13 +6032,13 @@ process_job(_ipp_job_t *job) /* I - Job */ ipp_attribute_t *attr; /* Job attribute */ char val[1280], /* IPP_NAME=value */ *valptr; /* Pointer into string */ -#ifndef WIN32 +#ifndef _WIN32 int mypipe[2]; /* Pipe for stderr */ char line[2048], /* Line from stderr */ *ptr, /* Pointer into line */ *endptr; /* End of line */ ssize_t bytes; /* Bytes read */ -#endif /* !WIN32 */ +#endif /* !_WIN32 */ fprintf(stderr, "Running command \"%s %s\".\n", job->printer->command, job->filename); @@ -6096,7 +6096,7 @@ process_job(_ipp_job_t *job) /* I - Job */ * Now run the program... */ -#ifdef WIN32 +#ifdef _WIN32 status = _spawnvpe(_P_WAIT, job->printer->command, myargv, myenvp); #else @@ -6206,20 +6206,20 @@ process_job(_ipp_job_t *job) /* I - Job */ while (wait(&status) < 0); # endif /* HAVE_WAITPID */ } -#endif /* WIN32 */ +#endif /* _WIN32 */ if (status) { -#ifndef WIN32 +#ifndef _WIN32 if (WIFEXITED(status)) -#endif /* !WIN32 */ +#endif /* !_WIN32 */ fprintf(stderr, "Command \"%s\" exited with status %d.\n", job->printer->command, WEXITSTATUS(status)); -#ifndef WIN32 +#ifndef _WIN32 else fprintf(stderr, "Command \"%s\" terminated with signal %d.\n", job->printer->command, WTERMSIG(status)); -#endif /* !WIN32 */ +#endif /* !_WIN32 */ job->state = IPP_JSTATE_ABORTED; } else if (status < 0) diff --git a/test/ipptool.c b/test/ipptool.c index 9c57ca2b9a..4cea4df0b9 100644 --- a/test/ipptool.c +++ b/test/ipptool.c @@ -21,7 +21,7 @@ #include #include #include -#ifdef WIN32 +#ifdef _WIN32 # include # ifndef R_OK # define R_OK 0 @@ -29,7 +29,7 @@ #else # include # include -#endif /* WIN32 */ +#endif /* _WIN32 */ #ifndef O_BINARY # define O_BINARY 0 #endif /* !O_BINARY */ @@ -174,9 +174,9 @@ static void print_xml_header(cups_file_t *outfile); static void print_xml_string(cups_file_t *outfile, const char *element, const char *s); static void print_xml_trailer(cups_file_t *outfile, int success, const char *message); static void set_variable(cups_file_t *outfile, _cups_vars_t *vars, const char *name, const char *value); -#ifndef WIN32 +#ifndef _WIN32 static void sigterm_handler(int sig); -#endif /* WIN32 */ +#endif /* _WIN32 */ static int timeout_cb(http_t *http, void *user_data); static void usage(void) __attribute__((noreturn)); static int validate_attr(cups_file_t *outfile, cups_array_t *errors, ipp_attribute_t *attr); @@ -213,14 +213,14 @@ main(int argc, /* I - Number of command-line args */ /* Global data */ -#ifndef WIN32 +#ifndef _WIN32 /* * Catch SIGINT and SIGTERM... */ signal(SIGINT, sigterm_handler); signal(SIGTERM, sigterm_handler); -#endif /* !WIN32 */ +#endif /* !_WIN32 */ /* * Initialize the locale and variables... @@ -432,9 +432,9 @@ main(int argc, /* I - Number of command-line args */ snprintf(filename, sizeof(filename), "%s.gz", argv[i]); if (access(filename, 0) && filename[0] != '/' -#ifdef WIN32 +#ifdef _WIN32 && (!isalpha(filename[0] & 255) || filename[1] != ':') -#endif /* WIN32 */ +#endif /* _WIN32 */ ) { snprintf(filename, sizeof(filename), "%s/ipptool/%s", @@ -650,9 +650,9 @@ main(int argc, /* I - Number of command-line args */ } if (access(argv[i], 0) && argv[i][0] != '/' -#ifdef WIN32 +#ifdef _WIN32 && (!isalpha(argv[i][0] & 255) || argv[i][1] != ':') -#endif /* WIN32 */ +#endif /* _WIN32 */ ) { snprintf(testname, sizeof(testname), "%s/ipptool/%s", cg->cups_datadir, @@ -2757,11 +2757,11 @@ do_tests(cups_file_t *outfile, /* I - Output file */ } if (!Cancel && status == HTTP_STATUS_ERROR && http->error != EINVAL && -#ifdef WIN32 +#ifdef _WIN32 http->error != WSAETIMEDOUT) #else http->error != ETIMEDOUT) -#endif /* WIN32 */ +#endif /* _WIN32 */ { if (httpReconnect2(http, 30000, NULL)) prev_pass = 0; @@ -2784,11 +2784,11 @@ do_tests(cups_file_t *outfile, /* I - Output file */ } if (!Cancel && status == HTTP_STATUS_ERROR && http->error != EINVAL && -#ifdef WIN32 +#ifdef _WIN32 http->error != WSAETIMEDOUT) #else http->error != ETIMEDOUT) -#endif /* WIN32 */ +#endif /* _WIN32 */ { if (httpReconnect2(http, 30000, NULL)) prev_pass = 0; @@ -4056,9 +4056,9 @@ get_filename(const char *testfile, /* I - Current test file */ *dstptr = '\0'; } else if (*src == '/' || !strchr(testfile, '/') -#ifdef WIN32 +#ifdef _WIN32 || (isalpha(*src & 255) && src[1] == ':') -#endif /* WIN32 */ +#endif /* _WIN32 */ ) { /* @@ -4353,7 +4353,7 @@ password_cb(const char *prompt) /* I - Prompt (unused) */ static void pause_message(const char *message) /* I - Message */ { -#ifdef WIN32 +#ifdef _WIN32 HANDLE tty; /* Console handle */ DWORD mode; /* Console mode */ char key; /* Key press */ @@ -4401,7 +4401,7 @@ pause_message(const char *message) /* I - Message */ close(tty); return; } -#endif /* WIN32 */ +#endif /* _WIN32 */ /* * Display the prompt... @@ -4409,7 +4409,7 @@ pause_message(const char *message) /* I - Message */ cupsFilePrintf(cupsFileStdout(), "%s\n---- PRESS ANY KEY ----", message); -#ifdef WIN32 +#ifdef _WIN32 /* * Read a key... */ @@ -4435,7 +4435,7 @@ pause_message(const char *message) /* I - Message */ tcsetattr(tty, TCSAFLUSH, &original); close(tty); -#endif /* WIN32 */ +#endif /* _WIN32 */ /* * Erase the "press any key" prompt... @@ -4997,7 +4997,7 @@ set_variable(cups_file_t *outfile, /* I - Output file */ } -#ifndef WIN32 +#ifndef _WIN32 /* * 'sigterm_handler()' - Handle SIGINT and SIGTERM. */ @@ -5012,7 +5012,7 @@ sigterm_handler(int sig) /* I - Signal number (unused) */ signal(SIGINT, SIG_DFL); signal(SIGTERM, SIG_DFL); } -#endif /* !WIN32 */ +#endif /* !_WIN32 */ /* diff --git a/vcnet/config.h b/vcnet/config.h index 8e0694608a..7f2a9de584 100644 --- a/vcnet/config.h +++ b/vcnet/config.h @@ -52,8 +52,8 @@ /* - * Map the POSIX strcasecmp() and strncasecmp() functions to the Win32 stricmp() - * and strnicmp() functions... + * Map the POSIX strcasecmp() and strncasecmp() functions to the Win32 + * _stricmp() and _strnicmp() functions... */ #define strcasecmp _stricmp @@ -94,8 +94,8 @@ typedef unsigned long useconds_t; * Version of software... */ -#define CUPS_SVERSION "CUPS v2.2.8" -#define CUPS_MINIMAL "CUPS/2.2.8" +#define CUPS_SVERSION "CUPS v2.2.9" +#define CUPS_MINIMAL "CUPS/2.2.9" /*