summaryrefslogtreecommitdiffstats
path: root/mkspecs/solaris-cc-64
diff options
context:
space:
mode:
authorJoão Abecasis <joao@trolltech.com>2010-01-15 17:05:06 (GMT)
committerJoão Abecasis <joao@trolltech.com>2010-01-22 16:50:19 (GMT)
commit0f8519368e2cfdaddb49cea60096fd03df69fd62 (patch)
treedd9b46cd1f5930de4c26554adc35da37272ec1f1 /mkspecs/solaris-cc-64
parent784946b8ea8b932924a831504387661d66170ca0 (diff)
downloadQt-0f8519368e2cfdaddb49cea60096fd03df69fd62.zip
Qt-0f8519368e2cfdaddb49cea60096fd03df69fd62.tar.gz
Qt-0f8519368e2cfdaddb49cea60096fd03df69fd62.tar.bz2
Refactor common POSIX support out of individual qplatformdefs.h
POSIX header incorporates previously refactored X/Open LFS extensions. Reviewed-by: Thiago Macieira
Diffstat (limited to 'mkspecs/solaris-cc-64')
-rw-r--r--mkspecs/solaris-cc-64/qplatformdefs.h35
1 files changed, 5 insertions, 30 deletions
diff --git a/mkspecs/solaris-cc-64/qplatformdefs.h b/mkspecs/solaris-cc-64/qplatformdefs.h
index d791e97..d01c48c 100644
--- a/mkspecs/solaris-cc-64/qplatformdefs.h
+++ b/mkspecs/solaris-cc-64/qplatformdefs.h
@@ -76,41 +76,16 @@
#include <net/if.h>
#endif
-// On 64-bit platforms sockets use socklen_t
-#define QT_SOCKLEN_T socklen_t
+#define QT_USE_XOPEN_LFS_EXTENSIONS
+#include "../common/posix/qplatformdefs.h"
+
+#undef QT_SOCKET_CONNECT
+#define QT_SOCKET_CONNECT qt_socket_connect
// Solaris redefines connect -> __xnet_connect with _XOPEN_SOURCE_EXTENDED
static inline int qt_socket_connect(int s, struct sockaddr *addr, QT_SOCKLEN_T addrlen)
{ return ::connect(s, addr, addrlen); }
-#include "../common/xopen-lfs/qplatformdefs.h"
-
-#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 qt_socket_connect
-#define QT_SOCKET_BIND ::bind
-#define QT_FILENO fileno
-#define QT_CLOSE ::close
-#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_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
-
// Only Solaris 7 and better support 64-bit
#define QT_SNPRINTF ::snprintf
#define QT_VSNPRINTF ::vsnprintf