diff options
| author | João Abecasis <joao@trolltech.com> | 2010-01-22 10:31:31 (GMT) |
|---|---|---|
| committer | João Abecasis <joao@trolltech.com> | 2010-01-22 16:50:21 (GMT) |
| commit | 2547e8d27fc7d651d21ba3805918ee3681f03f05 (patch) | |
| tree | 1a8ad8f34d742a9361b199f738437c4d29b0c7ae /mkspecs/aix-xlc | |
| parent | 31d18e089691c7ffb9c9c48579f1004eded9fc6d (diff) | |
| download | Qt-2547e8d27fc7d651d21ba3805918ee3681f03f05.zip Qt-2547e8d27fc7d651d21ba3805918ee3681f03f05.tar.gz Qt-2547e8d27fc7d651d21ba3805918ee3681f03f05.tar.bz2 | |
Merged qplatformdefs.h for AIX
I don't think the differences warranted having to maintain 3 slightly
differing copies. "Old" locations changed to a forwarding header to the
merged one.
Differences and how they were resolved in the merged file:
- comment on a workaround for a potential issue when using g++
=> comment kept
- #ifdef's for xlc-64 had been simplified, because it is only supported
on AIX 4.3 and above
=> versioned #ifdefs should still work on 64-bit platforms, so that
was preferred; comment left for future reference
- use of different condition in #if clause: (_XOPEN_SOURCE-0 >= 500)
=> verbosity preferred, since it is probably a workaround for a
preprocessor or #define bug.
Reviewed-by: Thiago Macieira
Diffstat (limited to 'mkspecs/aix-xlc')
| -rw-r--r-- | mkspecs/aix-xlc/qplatformdefs.h | 59 |
1 files changed, 1 insertions, 58 deletions
diff --git a/mkspecs/aix-xlc/qplatformdefs.h b/mkspecs/aix-xlc/qplatformdefs.h index 97cd0a1..d32f994 100644 --- a/mkspecs/aix-xlc/qplatformdefs.h +++ b/mkspecs/aix-xlc/qplatformdefs.h @@ -42,63 +42,6 @@ #ifndef QPLATFORMDEFS_H #define QPLATFORMDEFS_H -// Get Qt defines/settings - -#include "qglobal.h" - -// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs - -#include <unistd.h> - - -// We are hot - unistd.h should have turned on the specific APIs we requested - - -#include <pthread.h> -#include <dirent.h> -#include <fcntl.h> -#include <grp.h> -#include <pwd.h> -#include <signal.h> -#include <dlfcn.h> -#include <strings.h> // AIX X11 headers define FD_ZERO using bzero() - -#include <sys/types.h> -#include <sys/ioctl.h> -#include <sys/ipc.h> -#include <sys/time.h> -#include <sys/select.h> -#include <sys/shm.h> -#include <sys/socket.h> -#include <sys/stat.h> -#include <sys/wait.h> -#include <netinet/in.h> -#ifndef QT_NO_IPV6IFNAME -#include <net/if.h> -#endif - -#define QT_USE_XOPEN_LFS_EXTENSIONS -#include "../common/posix/qplatformdefs.h" - -#undef QT_SOCKLEN_T - -#ifdef _AIX43 -// AIX 4.3 and better -#define QT_SOCKLEN_T socklen_t -#elif _AIX42 -// AIX 4.2 -#define QT_SOCKLEN_T size_t -#else -// AIX 4.1 -#define QT_SOCKLEN_T size_t -// override -#define QT_SOCKOPTLEN_T int -#endif - -#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE-0 >= 500) -// AIX 4.3 and better -#define QT_SNPRINTF ::snprintf -#define QT_VSNPRINTF ::vsnprintf -#endif +#include "../common/aix/qplatformdefs.h" #endif // QPLATFORMDEFS_H |