diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-03-01 13:03:22 (GMT) |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-03-01 13:17:53 (GMT) |
| commit | 19095f432ef7ef424ea8dc89b19e43ed9f031b3e (patch) | |
| tree | 159654fbd2066eaea6d6fe78efc9726b5959eb3d /mkspecs/netbsd-g++/qplatformdefs.h | |
| parent | 196e1484c22f6347061fa433987a86d90e178a55 (diff) | |
| parent | 236c3ad7bacf165069b834b62fede6b147cfaf03 (diff) | |
| download | Qt-19095f432ef7ef424ea8dc89b19e43ed9f031b3e.zip Qt-19095f432ef7ef424ea8dc89b19e43ed9f031b3e.tar.gz Qt-19095f432ef7ef424ea8dc89b19e43ed9f031b3e.tar.bz2 | |
Merge remote branch 'qt/4.7' into lighthouse-4.7
Conflicts:
configure
src/gui/egl/qegl.cpp
src/gui/kernel/qdnd_p.h
Diffstat (limited to 'mkspecs/netbsd-g++/qplatformdefs.h')
| -rw-r--r-- | mkspecs/netbsd-g++/qplatformdefs.h | 53 |
1 files changed, 6 insertions, 47 deletions
diff --git a/mkspecs/netbsd-g++/qplatformdefs.h b/mkspecs/netbsd-g++/qplatformdefs.h index f455a86..2ce5b4a 100644 --- a/mkspecs/netbsd-g++/qplatformdefs.h +++ b/mkspecs/netbsd-g++/qplatformdefs.h @@ -75,54 +75,14 @@ #include <net/if.h> #endif -#define QT_FOPEN ::fopen -#define QT_FSEEK ::fseeko -#define QT_FTELL ::ftello -#define QT_FGETPOS ::fgetpos -#define QT_FSETPOS ::fsetpos -#define QT_MMAP ::mmap -#define QT_FPOS_T fpos_t -#define QT_OFF_T off_t - -#define QT_STATBUF struct stat -#define QT_STATBUF4TSTAT struct stat -#define QT_STAT ::stat -#define QT_FSTAT ::fstat -#define QT_LSTAT ::lstat -#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_OPEN ::open -#define QT_CLOSE ::close -#define QT_TRUNCATE ::truncate -#define QT_FTRUNCATE ::ftruncate -#define QT_LSEEK ::lseek -#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 +#include "../common/posix/qplatformdefs.h" -#define QT_SIGNAL_RETTYPE void -#define QT_SIGNAL_ARGS int -#define QT_SIGNAL_IGNORE SIG_IGN +#undef QT_OPEN_LARGEFILE +#define QT_OPEN_LARGEFILE 0 -// NetBSD 1.0 - 1.3.3 int -// NetBSD 1.4 - 1.5 socklen_t -#define QT_SOCKLEN_T socklen_t +// QT_SOCKLEN_T +// NetBSD 1.0 - 1.3.3 int +// NetBSD 1.4 - 1.5 socklen_t #define QT_SNPRINTF ::snprintf #define QT_VSNPRINTF ::vsnprintf @@ -132,5 +92,4 @@ #define QT_AOUT_UNDERSCORE #endif - #endif // QPLATFORMDEFS_H |