diff options
Diffstat (limited to 'mkspecs')
35 files changed, 255 insertions, 255 deletions
diff --git a/mkspecs/common/mac/qplatformdefs.h b/mkspecs/common/mac/qplatformdefs.h index 7ee337cce4..aad3b2330c 100644 --- a/mkspecs/common/mac/qplatformdefs.h +++ b/mkspecs/common/mac/qplatformdefs.h @@ -87,7 +87,7 @@ #define QT_SIGNAL_IGNORE (void (*)(int))1 -#define QT_SNPRINTF ::snprintf -#define QT_VSNPRINTF ::vsnprintf +#define QT_SNPRINTF ::snprintf +#define QT_VSNPRINTF ::vsnprintf #endif // QPLATFORMDEFS_H diff --git a/mkspecs/common/wince/qplatformdefs.h b/mkspecs/common/wince/qplatformdefs.h index d46a03d5ca..b4d44c1dc5 100644 --- a/mkspecs/common/wince/qplatformdefs.h +++ b/mkspecs/common/wince/qplatformdefs.h @@ -63,48 +63,48 @@ #include <windows.h> #ifdef QT_LARGEFILE_SUPPORT -#define QT_STATBUF struct _stati64 // non-ANSI defs -#define QT_STATBUF4TSTAT struct _stati64 // non-ANSI defs -#define QT_STAT ::_stati64 -#define QT_FSTAT ::_fstati64 +#define QT_STATBUF struct _stati64 // non-ANSI defs +#define QT_STATBUF4TSTAT struct _stati64 // non-ANSI defs +#define QT_STAT ::_stati64 +#define QT_FSTAT ::_fstati64 #else -#define QT_STATBUF struct stat // non-ANSI defs -#define QT_STATBUF4TSTAT struct stat // non-ANSI defs -#define QT_STAT ::qt_wince_stat -#define QT_FSTAT ::qt_wince__fstat +#define QT_STATBUF struct stat // non-ANSI defs +#define QT_STATBUF4TSTAT struct stat // non-ANSI defs +#define QT_STAT ::qt_wince_stat +#define QT_FSTAT ::qt_wince__fstat #endif -#define QT_STAT_REG _S_IFREG -#define QT_STAT_DIR _S_IFDIR -#define QT_STAT_MASK _S_IFMT +#define QT_STAT_REG _S_IFREG +#define QT_STAT_DIR _S_IFDIR +#define QT_STAT_MASK _S_IFMT #if defined(_S_IFLNK) -# define QT_STAT_LNK _S_IFLNK +# define QT_STAT_LNK _S_IFLNK #endif -#define QT_FILENO ::qt_wince___fileno -#define QT_OPEN ::qt_wince_open -#define QT_CLOSE ::qt_wince__close +#define QT_FILENO ::qt_wince___fileno +#define QT_OPEN ::qt_wince_open +#define QT_CLOSE ::qt_wince__close #ifdef QT_LARGEFILE_SUPPORT -#define QT_LSEEK ::_lseeki64 -#define QT_TSTAT ::_tstati64 +#define QT_LSEEK ::_lseeki64 +#define QT_TSTAT ::_tstati64 #else -#define QT_LSEEK ::qt_wince__lseek -#define QT_TSTAT ::_tstat +#define QT_LSEEK ::qt_wince__lseek +#define QT_TSTAT ::_tstat #endif -#define QT_READ ::qt_wince__read -#define QT_WRITE ::qt_wince__write -#define QT_ACCESS ::qt_wince__access -#define QT_GETCWD ::_getcwd -#define QT_CHDIR ::_chdir -#define QT_MKDIR ::qt_wince__mkdir -#define QT_RMDIR ::qt_wince__rmdir -#define QT_OPEN_LARGEFILE 0 -#define QT_OPEN_RDONLY _O_RDONLY -#define QT_OPEN_WRONLY _O_WRONLY -#define QT_OPEN_RDWR _O_RDWR -#define QT_OPEN_CREAT _O_CREAT -#define QT_OPEN_TRUNC _O_TRUNC -#define QT_OPEN_APPEND _O_APPEND -# define QT_OPEN_TEXT _O_TEXT -# define QT_OPEN_BINARY _O_BINARY +#define QT_READ ::qt_wince__read +#define QT_WRITE ::qt_wince__write +#define QT_ACCESS ::qt_wince__access +#define QT_GETCWD ::_getcwd +#define QT_CHDIR ::_chdir +#define QT_MKDIR ::qt_wince__mkdir +#define QT_RMDIR ::qt_wince__rmdir +#define QT_OPEN_LARGEFILE 0 +#define QT_OPEN_RDONLY _O_RDONLY +#define QT_OPEN_WRONLY _O_WRONLY +#define QT_OPEN_RDWR _O_RDWR +#define QT_OPEN_CREAT _O_CREAT +#define QT_OPEN_TRUNC _O_TRUNC +#define QT_OPEN_APPEND _O_APPEND +# define QT_OPEN_TEXT _O_TEXT +# define QT_OPEN_BINARY _O_BINARY #define QT_FOPEN ::fopen #define QT_FSEEK ::fseek @@ -115,17 +115,17 @@ #define QT_FPOS_T fpos_t #define QT_OFF_T long -#define QT_SIGNAL_ARGS int +#define QT_SIGNAL_ARGS int #define QT_VSNPRINTF(buffer, count, format, arg) \ _vsnprintf(buffer, count, format, arg) -#define QT_SNPRINTF ::_snprintf +#define QT_SNPRINTF ::_snprintf -# define F_OK 0 -# define X_OK 1 -# define W_OK 2 -# define R_OK 4 +# define F_OK 0 +# define X_OK 1 +# define W_OK 2 +# define R_OK 4 typedef int mode_t; diff --git a/mkspecs/cygwin-g++/qplatformdefs.h b/mkspecs/cygwin-g++/qplatformdefs.h index e7255a9342..b3ecc0f84d 100644 --- a/mkspecs/cygwin-g++/qplatformdefs.h +++ b/mkspecs/cygwin-g++/qplatformdefs.h @@ -73,7 +73,7 @@ #include <sys/ioctl.h> // Cygwin does not provide <sys/ipc.h> and <sys/shm.h> because it // doesn't support SysV IPC or shared memory. See for example: -// http://afni.nimh.nih.gov/afni/afniboard/messages/1725.html +// http://afni.nimh.nih.gov/afni/afniboard/messages/1725.html #include <sys/time.h> #include <sys/socket.h> #include <sys/stat.h> @@ -88,8 +88,8 @@ #define QT_OPEN_LARGEFILE 0 #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500) -#define QT_SNPRINTF ::snprintf -#define QT_VSNPRINTF ::vsnprintf +#define QT_SNPRINTF ::snprintf +#define QT_VSNPRINTF ::vsnprintf #endif #endif // QPLATFORMDEFS_H diff --git a/mkspecs/darwin-g++/qplatformdefs.h b/mkspecs/darwin-g++/qplatformdefs.h index 20ffac9e5b..f89d4bee80 100644 --- a/mkspecs/darwin-g++/qplatformdefs.h +++ b/mkspecs/darwin-g++/qplatformdefs.h @@ -79,7 +79,7 @@ #undef QT_OPEN_LARGEFILE #define QT_OPEN_LARGEFILE 0 -#define QT_SNPRINTF ::snprintf -#define QT_VSNPRINTF ::vsnprintf +#define QT_SNPRINTF ::snprintf +#define QT_VSNPRINTF ::vsnprintf #endif // QPLATFORMDEFS_H diff --git a/mkspecs/freebsd-g++/qplatformdefs.h b/mkspecs/freebsd-g++/qplatformdefs.h index 329c46e8d6..358e93aaf9 100644 --- a/mkspecs/freebsd-g++/qplatformdefs.h +++ b/mkspecs/freebsd-g++/qplatformdefs.h @@ -82,7 +82,7 @@ #define QT_OPEN_LARGEFILE 0 -#define QT_SNPRINTF ::snprintf -#define QT_VSNPRINTF ::vsnprintf +#define QT_SNPRINTF ::snprintf +#define QT_VSNPRINTF ::vsnprintf #endif // QPLATFORMDEFS_H diff --git a/mkspecs/hurd-g++/qplatformdefs.h b/mkspecs/hurd-g++/qplatformdefs.h index 8b47450abe..a6642eb83a 100644 --- a/mkspecs/hurd-g++/qplatformdefs.h +++ b/mkspecs/hurd-g++/qplatformdefs.h @@ -85,8 +85,8 @@ #include "../common/posix/qplatformdefs.h" #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500) -#define QT_SNPRINTF ::snprintf -#define QT_VSNPRINTF ::vsnprintf +#define QT_SNPRINTF ::snprintf +#define QT_VSNPRINTF ::vsnprintf #endif #endif // QPLATFORMDEFS_H diff --git a/mkspecs/irix-cc-64/qplatformdefs.h b/mkspecs/irix-cc-64/qplatformdefs.h index 5d8a792950..7338595bc8 100644 --- a/mkspecs/irix-cc-64/qplatformdefs.h +++ b/mkspecs/irix-cc-64/qplatformdefs.h @@ -88,8 +88,8 @@ // Irix 6.5 and better #if defined(_SGIAPI) -#define QT_SNPRINTF ::snprintf -#define QT_VSNPRINTF ::vsnprintf +#define QT_SNPRINTF ::snprintf +#define QT_VSNPRINTF ::vsnprintf #endif #endif // QPLATFORMDEFS_H diff --git a/mkspecs/irix-cc/qplatformdefs.h b/mkspecs/irix-cc/qplatformdefs.h index 5d8a792950..7338595bc8 100644 --- a/mkspecs/irix-cc/qplatformdefs.h +++ b/mkspecs/irix-cc/qplatformdefs.h @@ -88,8 +88,8 @@ // Irix 6.5 and better #if defined(_SGIAPI) -#define QT_SNPRINTF ::snprintf -#define QT_VSNPRINTF ::vsnprintf +#define QT_SNPRINTF ::snprintf +#define QT_VSNPRINTF ::vsnprintf #endif #endif // QPLATFORMDEFS_H diff --git a/mkspecs/irix-g++/qplatformdefs.h b/mkspecs/irix-g++/qplatformdefs.h index 38d107e1e0..90c3349c21 100644 --- a/mkspecs/irix-g++/qplatformdefs.h +++ b/mkspecs/irix-g++/qplatformdefs.h @@ -95,8 +95,8 @@ // Irix 6.5 and better #if defined(_SGIAPI) -#define QT_SNPRINTF ::snprintf -#define QT_VSNPRINTF ::vsnprintf +#define QT_SNPRINTF ::snprintf +#define QT_VSNPRINTF ::vsnprintf #endif #endif // QPLATFORMDEFS_H diff --git a/mkspecs/linux-clang/qplatformdefs.h b/mkspecs/linux-clang/qplatformdefs.h index bdf4d5056d..7366ca9bfa 100644 --- a/mkspecs/linux-clang/qplatformdefs.h +++ b/mkspecs/linux-clang/qplatformdefs.h @@ -87,14 +87,14 @@ #undef QT_SOCKLEN_T #if defined(__GLIBC__) && (__GLIBC__ >= 2) -#define QT_SOCKLEN_T socklen_t +#define QT_SOCKLEN_T socklen_t #else -#define QT_SOCKLEN_T int +#define QT_SOCKLEN_T int #endif #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500) -#define QT_SNPRINTF ::snprintf -#define QT_VSNPRINTF ::vsnprintf +#define QT_SNPRINTF ::snprintf +#define QT_VSNPRINTF ::vsnprintf #endif #endif // QPLATFORMDEFS_H diff --git a/mkspecs/linux-cxx/qplatformdefs.h b/mkspecs/linux-cxx/qplatformdefs.h index a948d169f0..ed36408e2e 100644 --- a/mkspecs/linux-cxx/qplatformdefs.h +++ b/mkspecs/linux-cxx/qplatformdefs.h @@ -94,8 +94,8 @@ #endif #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500) -#define QT_SNPRINTF ::snprintf -#define QT_VSNPRINTF ::vsnprintf +#define QT_SNPRINTF ::snprintf +#define QT_VSNPRINTF ::vsnprintf #endif #endif // QPLATFORMDEFS_H diff --git a/mkspecs/linux-g++/qplatformdefs.h b/mkspecs/linux-g++/qplatformdefs.h index 82d0e1663c..0e3e6077e3 100644 --- a/mkspecs/linux-g++/qplatformdefs.h +++ b/mkspecs/linux-g++/qplatformdefs.h @@ -93,8 +93,8 @@ #endif #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500) -#define QT_SNPRINTF ::snprintf -#define QT_VSNPRINTF ::vsnprintf +#define QT_SNPRINTF ::snprintf +#define QT_VSNPRINTF ::vsnprintf #endif #endif // QPLATFORMDEFS_H diff --git a/mkspecs/linux-kcc/qplatformdefs.h b/mkspecs/linux-kcc/qplatformdefs.h index a491e7ed6c..dbad004602 100644 --- a/mkspecs/linux-kcc/qplatformdefs.h +++ b/mkspecs/linux-kcc/qplatformdefs.h @@ -97,8 +97,8 @@ #endif #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500) -#define QT_SNPRINTF ::snprintf -#define QT_VSNPRINTF ::vsnprintf +#define QT_SNPRINTF ::snprintf +#define QT_VSNPRINTF ::vsnprintf #endif #endif // QPLATFORMDEFS_H diff --git a/mkspecs/linux-llvm/qplatformdefs.h b/mkspecs/linux-llvm/qplatformdefs.h index cbbe04e80c..6dae1a8ae5 100644 --- a/mkspecs/linux-llvm/qplatformdefs.h +++ b/mkspecs/linux-llvm/qplatformdefs.h @@ -94,8 +94,8 @@ #endif #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500) -#define QT_SNPRINTF ::snprintf -#define QT_VSNPRINTF ::vsnprintf +#define QT_SNPRINTF ::snprintf +#define QT_VSNPRINTF ::vsnprintf #endif #endif // QPLATFORMDEFS_H diff --git a/mkspecs/linux-lsb-g++/qplatformdefs.h b/mkspecs/linux-lsb-g++/qplatformdefs.h index 5060e1a222..a4855bcde5 100644 --- a/mkspecs/linux-lsb-g++/qplatformdefs.h +++ b/mkspecs/linux-lsb-g++/qplatformdefs.h @@ -105,8 +105,8 @@ #endif #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500) -#define QT_SNPRINTF ::snprintf -#define QT_VSNPRINTF ::vsnprintf +#define QT_SNPRINTF ::snprintf +#define QT_VSNPRINTF ::vsnprintf #endif #endif // QPLATFORMDEFS_H diff --git a/mkspecs/linux-pgcc/qplatformdefs.h b/mkspecs/linux-pgcc/qplatformdefs.h index a948d169f0..ed36408e2e 100644 --- a/mkspecs/linux-pgcc/qplatformdefs.h +++ b/mkspecs/linux-pgcc/qplatformdefs.h @@ -94,8 +94,8 @@ #endif #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500) -#define QT_SNPRINTF ::snprintf -#define QT_VSNPRINTF ::vsnprintf +#define QT_SNPRINTF ::snprintf +#define QT_VSNPRINTF ::vsnprintf #endif #endif // QPLATFORMDEFS_H diff --git a/mkspecs/lynxos-g++/qplatformdefs.h b/mkspecs/lynxos-g++/qplatformdefs.h index 469d032299..314c61443f 100644 --- a/mkspecs/lynxos-g++/qplatformdefs.h +++ b/mkspecs/lynxos-g++/qplatformdefs.h @@ -86,8 +86,8 @@ #endif #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500) -#define QT_SNPRINTF ::snprintf -#define QT_VSNPRINTF ::vsnprintf +#define QT_SNPRINTF ::snprintf +#define QT_VSNPRINTF ::vsnprintf #endif #endif // QPLATFORMDEFS_H diff --git a/mkspecs/netbsd-g++/qplatformdefs.h b/mkspecs/netbsd-g++/qplatformdefs.h index af7d0acf24..5388141931 100644 --- a/mkspecs/netbsd-g++/qplatformdefs.h +++ b/mkspecs/netbsd-g++/qplatformdefs.h @@ -84,8 +84,8 @@ // NetBSD 1.0 - 1.3.3 int // NetBSD 1.4 - 1.5 socklen_t -#define QT_SNPRINTF ::snprintf -#define QT_VSNPRINTF ::vsnprintf +#define QT_SNPRINTF ::snprintf +#define QT_VSNPRINTF ::vsnprintf // Older NetBSD versions may still use the a.out format instead of ELF. #ifndef __ELF__ diff --git a/mkspecs/openbsd-g++/qplatformdefs.h b/mkspecs/openbsd-g++/qplatformdefs.h index 9901bc632f..51844ee657 100644 --- a/mkspecs/openbsd-g++/qplatformdefs.h +++ b/mkspecs/openbsd-g++/qplatformdefs.h @@ -85,8 +85,8 @@ // OpenBSD 2.2 - 2.4 int // OpenBSD 2.5 - 2.8 socklen_t -#define QT_SNPRINTF ::snprintf -#define QT_VSNPRINTF ::vsnprintf +#define QT_SNPRINTF ::snprintf +#define QT_VSNPRINTF ::vsnprintf // 1003.1c-1995 says on page 38 (2.9.3, paragraph 3) that if _POSIX_THREADS // is defined, then _POSIX_THREAD_SAFE_FUNCTIONS must also be defined. diff --git a/mkspecs/sco-cc/qplatformdefs.h b/mkspecs/sco-cc/qplatformdefs.h index a880f4579b..5d039f6b3b 100644 --- a/mkspecs/sco-cc/qplatformdefs.h +++ b/mkspecs/sco-cc/qplatformdefs.h @@ -81,7 +81,7 @@ #undef QT_SOCKLEN_T #define QT_SOCKLEN_T size_t -#define QT_SNPRINTF ::snprintf -#define QT_VSNPRINTF ::vsnprintf +#define QT_SNPRINTF ::snprintf +#define QT_VSNPRINTF ::vsnprintf #endif // QPLATFORMDEFS_H diff --git a/mkspecs/sco-g++/qplatformdefs.h b/mkspecs/sco-g++/qplatformdefs.h index f0e5eb8293..cff39e6d1a 100644 --- a/mkspecs/sco-g++/qplatformdefs.h +++ b/mkspecs/sco-g++/qplatformdefs.h @@ -85,7 +85,7 @@ #undef QT_SOCKLEN_T #define QT_SOCKLEN_T int -#define QT_SNPRINTF ::snprintf -#define QT_VSNPRINTF ::vsnprintf +#define QT_SNPRINTF ::snprintf +#define QT_VSNPRINTF ::vsnprintf #endif // QPLATFORMDEFS_H diff --git a/mkspecs/solaris-cc-64/qplatformdefs.h b/mkspecs/solaris-cc-64/qplatformdefs.h index acdc14c81b..a0560c0157 100644 --- a/mkspecs/solaris-cc-64/qplatformdefs.h +++ b/mkspecs/solaris-cc-64/qplatformdefs.h @@ -87,8 +87,8 @@ static inline int qt_socket_connect(int s, struct sockaddr *addr, QT_SOCKLEN_T a { return ::connect(s, addr, addrlen); } // Only Solaris 7 and better support 64-bit -#define QT_SNPRINTF ::snprintf -#define QT_VSNPRINTF ::vsnprintf +#define QT_SNPRINTF ::snprintf +#define QT_VSNPRINTF ::vsnprintf #ifdef connect #undef connect diff --git a/mkspecs/solaris-cc/qplatformdefs.h b/mkspecs/solaris-cc/qplatformdefs.h index f905ad55c3..0b72174c6f 100644 --- a/mkspecs/solaris-cc/qplatformdefs.h +++ b/mkspecs/solaris-cc/qplatformdefs.h @@ -113,8 +113,8 @@ extern "C" int gethostname(char *, int); #if defined(_XOPEN_UNIX) // Solaris 2.6 and better -#define QT_SNPRINTF ::snprintf -#define QT_VSNPRINTF ::vsnprintf +#define QT_SNPRINTF ::snprintf +#define QT_VSNPRINTF ::vsnprintf #endif #ifdef connect diff --git a/mkspecs/solaris-g++-64/qplatformdefs.h b/mkspecs/solaris-g++-64/qplatformdefs.h index 4d408bf89e..11f25a5fc7 100644 --- a/mkspecs/solaris-g++-64/qplatformdefs.h +++ b/mkspecs/solaris-g++-64/qplatformdefs.h @@ -100,7 +100,7 @@ static inline int qt_socket_bind(int s, struct sockaddr *addr, QT_SOCKLEN_T addr #endif // Only Solaris 7 and better support 64-bit -#define QT_SNPRINTF ::snprintf -#define QT_VSNPRINTF ::vsnprintf +#define QT_SNPRINTF ::snprintf +#define QT_VSNPRINTF ::vsnprintf #endif // QPLATFORMDEFS_H diff --git a/mkspecs/solaris-g++/qplatformdefs.h b/mkspecs/solaris-g++/qplatformdefs.h index 44ab7bbb53..a1cd5797fa 100644 --- a/mkspecs/solaris-g++/qplatformdefs.h +++ b/mkspecs/solaris-g++/qplatformdefs.h @@ -128,8 +128,8 @@ extern "C" int gethostname(char *, int); #if defined(_XOPEN_UNIX) // Solaris 2.6 and better -#define QT_SNPRINTF ::snprintf -#define QT_VSNPRINTF ::vsnprintf +#define QT_SNPRINTF ::snprintf +#define QT_VSNPRINTF ::vsnprintf #endif #endif // QPLATFORMDEFS_H diff --git a/mkspecs/tru64-cxx/qplatformdefs.h b/mkspecs/tru64-cxx/qplatformdefs.h index 0ff0aa83e7..71e9bb4ace 100644 --- a/mkspecs/tru64-cxx/qplatformdefs.h +++ b/mkspecs/tru64-cxx/qplatformdefs.h @@ -102,8 +102,8 @@ extern "C" int usleep(useconds_t); #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE-0 >= 400) // Tru64 5.0 and better -#define QT_SNPRINTF ::snprintf -#define QT_VSNPRINTF ::vsnprintf +#define QT_SNPRINTF ::snprintf +#define QT_VSNPRINTF ::vsnprintf #endif #endif // QPLATFORMDEFS_H diff --git a/mkspecs/tru64-g++/qplatformdefs.h b/mkspecs/tru64-g++/qplatformdefs.h index 0ff0aa83e7..71e9bb4ace 100644 --- a/mkspecs/tru64-g++/qplatformdefs.h +++ b/mkspecs/tru64-g++/qplatformdefs.h @@ -102,8 +102,8 @@ extern "C" int usleep(useconds_t); #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE-0 >= 400) // Tru64 5.0 and better -#define QT_SNPRINTF ::snprintf -#define QT_VSNPRINTF ::vsnprintf +#define QT_SNPRINTF ::snprintf +#define QT_VSNPRINTF ::vsnprintf #endif #endif // QPLATFORMDEFS_H diff --git a/mkspecs/unixware-cc/qplatformdefs.h b/mkspecs/unixware-cc/qplatformdefs.h index 795e7cc98e..73e25a3b79 100644 --- a/mkspecs/unixware-cc/qplatformdefs.h +++ b/mkspecs/unixware-cc/qplatformdefs.h @@ -85,7 +85,7 @@ #define QT_OFF_T off_t #define QT_SOCKLEN_T size_t -#define QT_SNPRINTF ::snprintf -#define QT_VSNPRINTF ::vsnprintf +#define QT_SNPRINTF ::snprintf +#define QT_VSNPRINTF ::vsnprintf #endif // QPLATFORMDEFS_H diff --git a/mkspecs/unixware-g++/qplatformdefs.h b/mkspecs/unixware-g++/qplatformdefs.h index 795e7cc98e..73e25a3b79 100644 --- a/mkspecs/unixware-g++/qplatformdefs.h +++ b/mkspecs/unixware-g++/qplatformdefs.h @@ -85,7 +85,7 @@ #define QT_OFF_T off_t #define QT_SOCKLEN_T size_t -#define QT_SNPRINTF ::snprintf -#define QT_VSNPRINTF ::vsnprintf +#define QT_SNPRINTF ::snprintf +#define QT_VSNPRINTF ::vsnprintf #endif // QPLATFORMDEFS_H diff --git a/mkspecs/unsupported/integrity-ghs/qplatformdefs.h b/mkspecs/unsupported/integrity-ghs/qplatformdefs.h index 75b2c59972..ab0c134138 100644 --- a/mkspecs/unsupported/integrity-ghs/qplatformdefs.h +++ b/mkspecs/unsupported/integrity-ghs/qplatformdefs.h @@ -110,37 +110,37 @@ #define QT_OFF_T long #endif -#define QT_STAT_REG S_IFREG -#define QT_STAT_DIR S_IFDIR -#define QT_STAT_MASK S_IFMT -#define QT_STAT_LNK S_IFLNK -#define QT_SOCKET_CONNECT ::connect -#define QT_SOCKET_BIND ::bind -#define QT_FILENO fileno +#define QT_STAT_REG S_IFREG +#define QT_STAT_DIR S_IFDIR +#define QT_STAT_MASK S_IFMT +#define QT_STAT_LNK S_IFLNK +#define QT_SOCKET_CONNECT ::connect +#define QT_SOCKET_BIND ::bind +#define QT_FILENO fileno #ifndef QT_CLOSE -#define QT_CLOSE ::close +#define QT_CLOSE ::close #endif #ifndef QT_READ -#define QT_READ ::read +#define QT_READ ::read #endif #ifndef QT_WRITE -#define QT_WRITE ::write +#define QT_WRITE ::write #endif -#define QT_ACCESS ::access -#define QT_GETCWD ::getcwd -#define QT_CHDIR ::chdir -#define QT_MKDIR ::mkdir -#define QT_RMDIR ::rmdir -#define QT_OPEN_RDONLY O_RDONLY -#define QT_OPEN_WRONLY O_WRONLY -#define QT_OPEN_RDWR O_RDWR -#define QT_OPEN_CREAT O_CREAT -#define QT_OPEN_TRUNC O_TRUNC -#define QT_OPEN_APPEND O_APPEND - -#define QT_SIGNAL_RETTYPE void -#define QT_SIGNAL_ARGS int -#define QT_SIGNAL_IGNORE SIG_IGN +#define QT_ACCESS ::access +#define QT_GETCWD ::getcwd +#define QT_CHDIR ::chdir +#define QT_MKDIR ::mkdir +#define QT_RMDIR ::rmdir +#define QT_OPEN_RDONLY O_RDONLY +#define QT_OPEN_WRONLY O_WRONLY +#define QT_OPEN_RDWR O_RDWR +#define QT_OPEN_CREAT O_CREAT +#define QT_OPEN_TRUNC O_TRUNC +#define QT_OPEN_APPEND O_APPEND + +#define QT_SIGNAL_RETTYPE void +#define QT_SIGNAL_ARGS int +#define QT_SIGNAL_IGNORE SIG_IGN #define QT_MMAP ::mmap @@ -166,8 +166,8 @@ #define QT_SOCKLEN_T socklen_t #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500) -#define QT_SNPRINTF ::snprintf -#define QT_VSNPRINTF ::vsnprintf +#define QT_SNPRINTF ::snprintf +#define QT_VSNPRINTF ::vsnprintf #endif // INTEGRITY doesn't enable the declaration in _POSIX_SOURCE mode, diff --git a/mkspecs/unsupported/linux-armcc/qplatformdefs.h b/mkspecs/unsupported/linux-armcc/qplatformdefs.h index 2f023824ec..c1066ee9a2 100644 --- a/mkspecs/unsupported/linux-armcc/qplatformdefs.h +++ b/mkspecs/unsupported/linux-armcc/qplatformdefs.h @@ -93,8 +93,8 @@ #endif #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500) -#define QT_SNPRINTF ::snprintf -#define QT_VSNPRINTF ::vsnprintf +#define QT_SNPRINTF ::snprintf +#define QT_VSNPRINTF ::vsnprintf #endif #endif // QPLATFORMDEFS_H diff --git a/mkspecs/unsupported/qnx-X11-g++/qplatformdefs.h b/mkspecs/unsupported/qnx-X11-g++/qplatformdefs.h index b75598f12f..9e902ebfcd 100644 --- a/mkspecs/unsupported/qnx-X11-g++/qplatformdefs.h +++ b/mkspecs/unsupported/qnx-X11-g++/qplatformdefs.h @@ -84,8 +84,8 @@ #define QT_USE_XOPEN_LFS_EXTENSIONS #include "../../common/posix/qplatformdefs.h" -#define QT_SNPRINTF ::snprintf -#define QT_VSNPRINTF ::vsnprintf +#define QT_SNPRINTF ::snprintf +#define QT_VSNPRINTF ::vsnprintf // QNX6 doesn't have getpagesize() inline int getpagesize() diff --git a/mkspecs/unsupported/win32-msvc2003/qplatformdefs.h b/mkspecs/unsupported/win32-msvc2003/qplatformdefs.h index da924e4631..21f9399f33 100644 --- a/mkspecs/unsupported/win32-msvc2003/qplatformdefs.h +++ b/mkspecs/unsupported/win32-msvc2003/qplatformdefs.h @@ -68,49 +68,49 @@ #define Q_FS_FAT #ifdef QT_LARGEFILE_SUPPORT -#define QT_STATBUF struct _stati64 // non-ANSI defs -#define QT_STATBUF4TSTAT struct _stati64 // non-ANSI defs -#define QT_STAT ::_stati64 -#define QT_FSTAT ::_fstati64 +#define QT_STATBUF struct _stati64 // non-ANSI defs +#define QT_STATBUF4TSTAT struct _stati64 // non-ANSI defs +#define QT_STAT ::_stati64 +#define QT_FSTAT ::_fstati64 #else -#define QT_STATBUF struct _stat // non-ANSI defs -#define QT_STATBUF4TSTAT struct _stat // non-ANSI defs -#define QT_STAT ::_stat -#define QT_FSTAT ::_fstat +#define QT_STATBUF struct _stat // non-ANSI defs +#define QT_STATBUF4TSTAT struct _stat // non-ANSI defs +#define QT_STAT ::_stat +#define QT_FSTAT ::_fstat #endif -#define QT_STAT_REG _S_IFREG -#define QT_STAT_DIR _S_IFDIR -#define QT_STAT_MASK _S_IFMT +#define QT_STAT_REG _S_IFREG +#define QT_STAT_DIR _S_IFDIR +#define QT_STAT_MASK _S_IFMT #if defined(_S_IFLNK) -# define QT_STAT_LNK _S_IFLNK +# define QT_STAT_LNK _S_IFLNK #endif -#define QT_FILENO _fileno -#define QT_OPEN ::_open -#define QT_CLOSE ::_close +#define QT_FILENO _fileno +#define QT_OPEN ::_open +#define QT_CLOSE ::_close #ifdef QT_LARGEFILE_SUPPORT -#define QT_LSEEK ::_lseeki64 -#define QT_TSTAT ::_tstati64 +#define QT_LSEEK ::_lseeki64 +#define QT_TSTAT ::_tstati64 #else -#define QT_LSEEK ::_lseek -#define QT_TSTAT ::_tstat +#define QT_LSEEK ::_lseek +#define QT_TSTAT ::_tstat #endif -#define QT_READ ::_read -#define QT_WRITE ::_write -#define QT_ACCESS ::_access -#define QT_GETCWD ::_getcwd -#define QT_CHDIR ::_chdir -#define QT_MKDIR ::_mkdir -#define QT_RMDIR ::_rmdir +#define QT_READ ::_read +#define QT_WRITE ::_write +#define QT_ACCESS ::_access +#define QT_GETCWD ::_getcwd +#define QT_CHDIR ::_chdir +#define QT_MKDIR ::_mkdir +#define QT_RMDIR ::_rmdir #define QT_OPEN_LARGEFILE 0 -#define QT_OPEN_RDONLY _O_RDONLY -#define QT_OPEN_WRONLY _O_WRONLY -#define QT_OPEN_RDWR _O_RDWR -#define QT_OPEN_CREAT _O_CREAT -#define QT_OPEN_TRUNC _O_TRUNC -#define QT_OPEN_APPEND _O_APPEND +#define QT_OPEN_RDONLY _O_RDONLY +#define QT_OPEN_WRONLY _O_WRONLY +#define QT_OPEN_RDWR _O_RDWR +#define QT_OPEN_CREAT _O_CREAT +#define QT_OPEN_TRUNC _O_TRUNC +#define QT_OPEN_APPEND _O_APPEND #if defined(O_TEXT) -# define QT_OPEN_TEXT _O_TEXT -# define QT_OPEN_BINARY _O_BINARY +# define QT_OPEN_TEXT _O_TEXT +# define QT_OPEN_BINARY _O_BINARY #endif #include "../../common/c89/qplatformdefs.h" @@ -125,15 +125,15 @@ #define QT_OFF_T __int64 #endif -#define QT_SIGNAL_ARGS int +#define QT_SIGNAL_ARGS int #define QT_VSNPRINTF ::_vsnprintf -#define QT_SNPRINTF ::_snprintf +#define QT_SNPRINTF ::_snprintf -# define F_OK 0 -# define X_OK 1 -# define W_OK 2 -# define R_OK 4 +# define F_OK 0 +# define X_OK 1 +# define W_OK 2 +# define R_OK 4 typedef int mode_t; diff --git a/mkspecs/win32-g++/qplatformdefs.h b/mkspecs/win32-g++/qplatformdefs.h index 4f339cbea6..a5401075ab 100644 --- a/mkspecs/win32-g++/qplatformdefs.h +++ b/mkspecs/win32-g++/qplatformdefs.h @@ -79,57 +79,57 @@ typedef enum { #endif #ifdef QT_LARGEFILE_SUPPORT -#define QT_STATBUF struct _stati64 // non-ANSI defs -#define QT_STATBUF4TSTAT struct _stati64 // non-ANSI defs -#define QT_STAT ::_stati64 -#define QT_FSTAT ::_fstati64 +#define QT_STATBUF struct _stati64 // non-ANSI defs +#define QT_STATBUF4TSTAT struct _stati64 // non-ANSI defs +#define QT_STAT ::_stati64 +#define QT_FSTAT ::_fstati64 #else -#define QT_STATBUF struct _stat // non-ANSI defs -#define QT_STATBUF4TSTAT struct _stat // non-ANSI defs -#define QT_STAT ::_stat -#define QT_FSTAT ::_fstat +#define QT_STATBUF struct _stat // non-ANSI defs +#define QT_STATBUF4TSTAT struct _stat // non-ANSI defs +#define QT_STAT ::_stat +#define QT_FSTAT ::_fstat #endif -#define QT_STAT_REG _S_IFREG -#define QT_STAT_DIR _S_IFDIR -#define QT_STAT_MASK _S_IFMT +#define QT_STAT_REG _S_IFREG +#define QT_STAT_DIR _S_IFDIR +#define QT_STAT_MASK _S_IFMT #if defined(_S_IFLNK) -# define QT_STAT_LNK _S_IFLNK +# define QT_STAT_LNK _S_IFLNK #endif -#define QT_FILENO _fileno -#define QT_OPEN ::_open -#define QT_CLOSE ::_close +#define QT_FILENO _fileno +#define QT_OPEN ::_open +#define QT_CLOSE ::_close #ifdef QT_LARGEFILE_SUPPORT -#define QT_LSEEK ::_lseeki64 +#define QT_LSEEK ::_lseeki64 #ifndef UNICODE -#define QT_TSTAT ::_stati64 +#define QT_TSTAT ::_stati64 #else -#define QT_TSTAT ::_wstati64 +#define QT_TSTAT ::_wstati64 #endif #else -#define QT_LSEEK ::_lseek +#define QT_LSEEK ::_lseek #ifndef UNICODE -#define QT_TSTAT ::_stat +#define QT_TSTAT ::_stat #else -#define QT_TSTAT ::_wstat +#define QT_TSTAT ::_wstat #endif #endif -#define QT_READ ::_read -#define QT_WRITE ::_write -#define QT_ACCESS ::_access -#define QT_GETCWD ::_getcwd -#define QT_CHDIR ::_chdir -#define QT_MKDIR ::_mkdir -#define QT_RMDIR ::_rmdir +#define QT_READ ::_read +#define QT_WRITE ::_write +#define QT_ACCESS ::_access +#define QT_GETCWD ::_getcwd +#define QT_CHDIR ::_chdir +#define QT_MKDIR ::_mkdir +#define QT_RMDIR ::_rmdir #define QT_OPEN_LARGEFILE 0 -#define QT_OPEN_RDONLY _O_RDONLY -#define QT_OPEN_WRONLY _O_WRONLY -#define QT_OPEN_RDWR _O_RDWR -#define QT_OPEN_CREAT _O_CREAT -#define QT_OPEN_TRUNC _O_TRUNC -#define QT_OPEN_APPEND _O_APPEND +#define QT_OPEN_RDONLY _O_RDONLY +#define QT_OPEN_WRONLY _O_WRONLY +#define QT_OPEN_RDWR _O_RDWR +#define QT_OPEN_CREAT _O_CREAT +#define QT_OPEN_TRUNC _O_TRUNC +#define QT_OPEN_APPEND _O_APPEND #if defined(O_TEXT) -# define QT_OPEN_TEXT _O_TEXT -# define QT_OPEN_BINARY _O_BINARY +# define QT_OPEN_TEXT _O_TEXT +# define QT_OPEN_BINARY _O_BINARY #endif #include "../common/c89/qplatformdefs.h" @@ -144,15 +144,15 @@ typedef enum { #define QT_OFF_T off64_t #endif -#define QT_SIGNAL_ARGS int +#define QT_SIGNAL_ARGS int -#define QT_VSNPRINTF ::_vsnprintf -#define QT_SNPRINTF ::_snprintf +#define QT_VSNPRINTF ::_vsnprintf +#define QT_SNPRINTF ::_snprintf -# define F_OK 0 -# define X_OK 1 -# define W_OK 2 -# define R_OK 4 +# define F_OK 0 +# define X_OK 1 +# define W_OK 2 +# define R_OK 4 #endif // QPLATFORMDEFS_H diff --git a/mkspecs/win32-msvc2005/qplatformdefs.h b/mkspecs/win32-msvc2005/qplatformdefs.h index c7370f1c63..f621d08956 100644 --- a/mkspecs/win32-msvc2005/qplatformdefs.h +++ b/mkspecs/win32-msvc2005/qplatformdefs.h @@ -66,51 +66,51 @@ #include <stdlib.h> #ifdef QT_LARGEFILE_SUPPORT -#define QT_STATBUF struct _stati64 // non-ANSI defs -#define QT_STATBUF4TSTAT struct _stati64 // non-ANSI defs -#define QT_STAT ::_stati64 -#define QT_FSTAT ::_fstati64 +#define QT_STATBUF struct _stati64 // non-ANSI defs +#define QT_STATBUF4TSTAT struct _stati64 // non-ANSI defs +#define QT_STAT ::_stati64 +#define QT_FSTAT ::_fstati64 #else -#define QT_STATBUF struct _stat // non-ANSI defs -#define QT_STATBUF4TSTAT struct _stat // non-ANSI defs -#define QT_STAT ::_stat -#define QT_FSTAT ::_fstat +#define QT_STATBUF struct _stat // non-ANSI defs +#define QT_STATBUF4TSTAT struct _stat // non-ANSI defs +#define QT_STAT ::_stat +#define QT_FSTAT ::_fstat #endif -#define QT_STAT_REG _S_IFREG -#define QT_STAT_DIR _S_IFDIR -#define QT_STAT_MASK _S_IFMT +#define QT_STAT_REG _S_IFREG +#define QT_STAT_DIR _S_IFDIR +#define QT_STAT_MASK _S_IFMT #if defined(_S_IFLNK) -# define QT_STAT_LNK _S_IFLNK +# define QT_STAT_LNK _S_IFLNK #else -# define QT_STAT_LNK 0120000 +# define QT_STAT_LNK 0120000 #endif -#define QT_FILENO _fileno -#define QT_OPEN ::_open -#define QT_CLOSE ::_close +#define QT_FILENO _fileno +#define QT_OPEN ::_open +#define QT_CLOSE ::_close #ifdef QT_LARGEFILE_SUPPORT -#define QT_LSEEK ::_lseeki64 -#define QT_TSTAT ::_tstati64 +#define QT_LSEEK ::_lseeki64 +#define QT_TSTAT ::_tstati64 #else -#define QT_LSEEK ::_lseek -#define QT_TSTAT ::_tstat +#define QT_LSEEK ::_lseek +#define QT_TSTAT ::_tstat #endif -#define QT_READ ::_read -#define QT_WRITE ::_write -#define QT_ACCESS ::_access -#define QT_GETCWD ::_getcwd -#define QT_CHDIR ::_chdir -#define QT_MKDIR ::_mkdir -#define QT_RMDIR ::_rmdir +#define QT_READ ::_read +#define QT_WRITE ::_write +#define QT_ACCESS ::_access +#define QT_GETCWD ::_getcwd +#define QT_CHDIR ::_chdir +#define QT_MKDIR ::_mkdir +#define QT_RMDIR ::_rmdir #define QT_OPEN_LARGEFILE 0 -#define QT_OPEN_RDONLY _O_RDONLY -#define QT_OPEN_WRONLY _O_WRONLY -#define QT_OPEN_RDWR _O_RDWR -#define QT_OPEN_CREAT _O_CREAT -#define QT_OPEN_TRUNC _O_TRUNC -#define QT_OPEN_APPEND _O_APPEND +#define QT_OPEN_RDONLY _O_RDONLY +#define QT_OPEN_WRONLY _O_WRONLY +#define QT_OPEN_RDWR _O_RDWR +#define QT_OPEN_CREAT _O_CREAT +#define QT_OPEN_TRUNC _O_TRUNC +#define QT_OPEN_APPEND _O_APPEND #if defined(O_TEXT) -# define QT_OPEN_TEXT _O_TEXT -# define QT_OPEN_BINARY _O_BINARY +# define QT_OPEN_TEXT _O_TEXT +# define QT_OPEN_BINARY _O_BINARY #endif #include "../common/c89/qplatformdefs.h" @@ -125,17 +125,17 @@ #define QT_OFF_T __int64 #endif -#define QT_SIGNAL_ARGS int +#define QT_SIGNAL_ARGS int #define QT_VSNPRINTF(buffer, count, format, arg) \ vsnprintf_s(buffer, count, count-1, format, arg) -#define QT_SNPRINTF ::_snprintf +#define QT_SNPRINTF ::_snprintf -# define F_OK 0 -# define X_OK 1 -# define W_OK 2 -# define R_OK 4 +# define F_OK 0 +# define X_OK 1 +# define W_OK 2 +# define R_OK 4 typedef int mode_t; |