Add Interix supportfeat/add-interix-support

Signed-off-by: OBATA Akio <obache@wizdas.com>

6 files changed, 184 insertions, 2 deletions

diff --git a/mkspecs/interix-g++/qmake.conf b/mkspecs/interix-g++/qmake.conf
new file mode 100644
index 00000000..f8a03d3f
--- /dev/null
+++ b/mkspecs/interix-g++/qmake.conf
@@ -0,0 +1,83 @@
+#
+#
+# qmake configuration for interix-g++
+#
+
+MAKEFILE_GENERATOR	= UNIX
+TEMPLATE		= app
+CONFIG			+= qt warn_on release link_prl
+
+QMAKE_CC		= gcc
+QMAKE_LEX		= lex
+QMAKE_LEXFLAGS		= 
+QMAKE_YACC		= yacc
+QMAKE_YACCFLAGS		= -d
+QMAKE_CFLAGS		= -pipe
+QMAKE_CFLAGS_DEPS	= -M
+QMAKE_CFLAGS_WARN_ON	= -Wall -W
+QMAKE_CFLAGS_WARN_OFF	= -w
+QMAKE_CFLAGS_RELEASE	= -O2
+QMAKE_CFLAGS_DEBUG	= -g
+QMAKE_CFLAGS_SHLIB	= 
+QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
+QMAKE_CFLAGS_THREAD	= -D_REENTRANT
+
+QMAKE_CXX		= g++
+QMAKE_CXXFLAGS		= $$QMAKE_CFLAGS
+QMAKE_CXXFLAGS_DEPS	= $$QMAKE_CFLAGS_DEPS
+QMAKE_CXXFLAGS_WARN_ON	= $$QMAKE_CFLAGS_WARN_ON
+QMAKE_CXXFLAGS_WARN_OFF	= $$QMAKE_CFLAGS_WARN_OFF
+QMAKE_CXXFLAGS_RELEASE	= $$QMAKE_CFLAGS_RELEASE
+QMAKE_CXXFLAGS_DEBUG	= $$QMAKE_CFLAGS_DEBUG
+QMAKE_CXXFLAGS_SHLIB	= $$QMAKE_CFLAGS_SHLIB
+QMAKE_CXXFLAGS_YACC	= $$QMAKE_CFLAGS_YACC
+QMAKE_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
+
+QMAKE_INCDIR		= /usr/local/include
+QMAKE_LIBDIR		= /usr/local/lib
+QMAKE_INCDIR_X11	= /usr/X11R6/include /usr/local/include/bind
+QMAKE_LIBDIR_X11	= /usr/X11R6/lib /usr/local/lib/bind
+QMAKE_INCDIR_TQT	= $(TQTDIR)/include
+QMAKE_LIBDIR_TQT	= $(TQTDIR)/lib
+QMAKE_INCDIR_OPENGL	= /usr/X11R6/include
+QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
+
+QMAKE_LINK		= g++
+QMAKE_LINK_SHLIB	= g++
+QMAKE_LINK_SHLIB_CMD	= $$QMAKE_LINK_SHLIB $(LFLAGS) \
+	$$QMAKE_CFLAGS_SHLIB $$QMAKE_LFLAGS \
+	-o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
+QMAKE_LFLAGS		=
+QMAKE_LFLAGS_RELEASE	=
+QMAKE_LFLAGS_DEBUG	=
+QMAKE_LFLAGS_SHLIB	= -shared
+QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
+QMAKE_LFLAGS_SONAME	= -Wl,-soname,
+QMAKE_LFLAGS_THREAD	= 
+QMAKE_RPATH		= -Wl,-rpath
+
+QMAKE_LIBS		=
+QMAKE_LIBS_DYNLOAD	= -ldl
+QMAKE_LIBS_X11		= -lXext -lX11 -lm -lbind -ldb -ldl
+QMAKE_LIBS_X11SM	= -lSM -lICE
+QMAKE_LIBS_QT		= -lqt
+QMAKE_LIBS_QT_THREAD	= -ltqt-mt
+QMAKE_LIBS_OPENGL	= -lGLU -lGL -lXmu
+QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
+QMAKE_LIBS_THREAD	= -lpthread
+
+QMAKE_MOC		= $(TQTDIR)/bin/tqmoc
+QMAKE_UIC		= $(TQTDIR)/bin/tquic
+
+QMAKE_AR		= ar q
+QMAKE_RANLIB		= ranlib
+
+QMAKE_TAR		= tar -cf
+QMAKE_GZIP		= gzip -9f
+
+QMAKE_COPY		= cp -f
+QMAKE_MOVE		= mv -f
+QMAKE_DEL_FILE		= rm -f
+QMAKE_DEL_DIR		= rmdir
+QMAKE_CHK_DIR_EXISTS	= test -d
+QMAKE_MKDIR		= mkdir -p
diff --git a/mkspecs/interix-g++/qplatformdefs.h b/mkspecs/interix-g++/qplatformdefs.h
new file mode 100644
index 00000000..9bab8ae8
--- /dev/null
+++ b/mkspecs/interix-g++/qplatformdefs.h
@@ -0,0 +1,87 @@
+#ifndef TQPLATFORMDEFS_H
+#define TQPLATFORMDEFS_H
+
+// Get TQt defines/settings
+
+#include "ntqglobal.h"
+
+extern "C" {
+
+// 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
+
+
+#ifdef TQT_THREAD_SUPPORT
+#include <pthread.h>
+#endif
+
+#include <dirent.h>
+#include <fcntl.h>
+#include <grp.h>
+#include <pwd.h>
+#include <signal.h>
+#include <dlfcn.h>
+
+#include <sys/types.h>
+#include <sys/ioctl.h>
+#include <sys/ipc.h>
+#include <sys/time.h>
+#include <sys/shm.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
+
+// DNS header files are not fully covered by X/Open specifications.
+// In particular nothing is said about res_* :/
+// On BSDs header files <netinet/in.h> and <arpa/nameser.h> are not
+// included by <resolv.h>. Note that <arpa/nameser.h> must be included
+// before <resolv.h>.
+#include <arpa/inet.h>
+#include <netinet/in.h>
+#include <arpa/nameser.h>
+#include <resolv.h>
+
+};
+
+#if !defined(TQT_NO_COMPAT)
+#define QT_STATBUF		struct stat
+#define QT_STATBUF4TSTAT	struct stat
+#define QT_STAT			::stat
+#define QT_FSTAT		::fstat
+#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_FILENO		fileno
+#define QT_OPEN			::open
+#define QT_CLOSE		::close
+#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_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
+#endif
+
+#define QT_SIGNAL_RETTYPE	void
+#define QT_SIGNAL_ARGS		int
+#define QT_SIGNAL_IGNORE	SIG_IGN
+
+#define QT_SOCKLEN_T		int
+
+#define QT_SNPRINTF		::snprintf
+#define QT_VSNPRINTF		::vsnprintf
+
+#endif // TQPLATFORMDEFS_H
diff --git a/src/codecs/qtextcodec.cpp b/src/codecs/qtextcodec.cpp
index c37a7cb1..458dc5d0 100644
--- a/src/codecs/qtextcodec.cpp
+++ b/src/codecs/qtextcodec.cpp
@@ -85,7 +85,13 @@
 #include <locale.h>
 #endif
 #if defined(_XOPEN_UNIX) && !defined(Q_OS_QNX6)
+#ifdef Q_OS_INTERIX
+extern "C" {
+#endif
 #include <langinfo.h>
+#ifdef Q_OS_INTERIX
+}
+#endif
 #endif
 
 static TQValueList<TQTextCodec*> *all = 0;
diff --git a/src/kernel/qlock.cpp b/src/kernel/qlock.cpp
index 948e7602..f53afc49 100644
--- a/src/kernel/qlock.cpp
+++ b/src/kernel/qlock.cpp
@@ -50,7 +50,7 @@
 #define _WANT_SEMUN
 #include <sys/sem.h>
 #if defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED) \
-    || defined(Q_OS_FREEBSD) || defined(Q_OS_OPENBSD) || defined(Q_OS_NETBSD) || defined(Q_OS_BSDI)
+    || defined(Q_OS_FREEBSD) || defined(Q_OS_OPENBSD) || defined(Q_OS_NETBSD) || defined(Q_OS_BSDI) || defined(Q_OS_INTERIX)
 /* union semun is defined by including <sys/sem.h> */
 #else
 /* according to X/OPEN we have to define it ourselves */
diff --git a/src/tools/ntqglobal.h b/src/tools/ntqglobal.h
index 8bc73aed..ab4d1101 100644
--- a/src/tools/ntqglobal.h
+++ b/src/tools/ntqglobal.h
@@ -66,6 +66,7 @@
      NETBSD	- NetBSD
      OPENBSD	- OpenBSD
      BSDI	- BSD/OS
+     INTERIX	- Interix
      IRIX	- SGI Irix
      OSF	- HP Tru64 UNIX
      SCO	- SCO OpenServer 5
@@ -131,6 +132,9 @@
 #elif defined(__bsdi__)
 #  define Q_OS_BSDI
 #  define Q_OS_BSD4
+#elif defined(__INTERIX)
+#  define Q_OS_INTERIX
+#  define Q_OS_BSD4
 #elif defined(__sgi)
 #  define Q_OS_IRIX
 #elif defined(__osf__)
diff --git a/src/tools/qdatastream.cpp b/src/tools/qdatastream.cpp
index d5b7162f..b17502cd 100644
--- a/src/tools/qdatastream.cpp
+++ b/src/tools/qdatastream.cpp
@@ -489,6 +489,8 @@ void TQDataStream::setByteOrder( int bo )
 
 #if defined(Q_OS_HPUX) && !defined(__LP64__)
 extern "C" long long __strtoll( const char *, char**, int );
+#elif defined(Q_OS_INTERIX)
+extern "C" long long strtoq( const char *, char**, int );
 #endif
 
 static TQ_INT64 read_int_ascii( TQDataStream *s )
@@ -513,7 +515,7 @@ static TQ_INT64 read_int_ascii( TQDataStream *s )
     return _atoi64( buf );
 #  elif defined(Q_OS_HPUX)
     return __strtoll( buf, (char**)0, 10 );
-#  elif defined(Q_OS_MACX) && defined(QT_MACOSX_VERSION) && QT_MACOSX_VERSION < 0x1020
+#  elif defined(Q_OS_MACX) && defined(QT_MACOSX_VERSION) && QT_MACOSX_VERSION < 0x1020 || defined(Q_OS_INTERIX)
     return strtoq( buf, (char**)0, 10 );
 #  else
     return strtoll( buf, (char**)0, 10 );	// C99 function