2 files changed, 9 insertions, 3 deletions

diff --git a/mkspecs/irix-cc/qmake.conf b/mkspecs/irix-cc/qmake.conf
index 31411af..469a473 100644
--- a/mkspecs/irix-cc/qmake.conf
+++ b/mkspecs/irix-cc/qmake.conf
@@ -1,113 +1,115 @@
 #
 # $Id$
 #
-# qmake configuration for irix-n32
+# qmake configuration for irix-cc
 #
 # From cc(1):
         # -n32
         #   Generates a (new) 32-bit object. This defaults to -mips3 if
         #   -mips4 has not been specified.
         # -LANG: ...
         #   The language feature option group controls the source language
         #   interpretation assumed by the compiler. The individual controls
         #   in this group are as follows:
         #     ansi-for-init-scope [ = ( ON|OFF ) ]
         #       Enables or disables the ANSI scoping rules for for-init
         #       declarations (the scope of the name declared extends to
         #       the end of the for statement). This enables the behavior
         #       that is required by the C++ standard. The default value
         #       is OFF, which is the ARM behavior (the scope of the name
         #       declared extends to the end of the block enclosing the for
         #       statement).
         #     bool [ = ( ON|OFF ) ]
         #       Enables or disables the predefined bool data type, along
         #       with the predefined values true and false. Use this option
         #       only to suppress this type in old code that defines bool
         #       itself.  Because this option changes the mangling of function
         #       names with bool parameters, all files comprising a program
         #       should be compiled with consistent options.
         #       Default is ON.
         #       The _BOOL feature macro can be used in #ifdefs to do conditional
         #       compilation based on whether or not this option is enabled.
         #     std
         #       Enables use of the standard C++ library and standard-
         #       conforming iostream library.  Specifying this flag also
         #       triggers other standard-conforming behavior, such as the
         #       new rules for the scope of for loop initializers.
 #
 
         MAKEFILE_GENERATOR= UNIX
         TEMPLATE        = app
-        CONFIG          += qt warn_on release
+        CONFIG          += qt warn_on release link_prl
 
         QMAKE_CC        = cc
         QMAKE_LEX       = flex
         QMAKE_LEXFLAGS  = 
         QMAKE_YACC      = yacc
         QMAKE_YACCFLAGS         = -d
         QMAKE_CFLAGS    = -n32 -woff 1021,1209,1233,1314,1355,1375,1506 $(CFLAGS_EXTRA)
         QMAKE_CFLAGS_DEPS= -M
         QMAKE_CFLAGS_WARN_ON= -fullwarn
         QMAKE_CFLAGS_WARN_OFF=
         QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2 -OPT:Olimit=3000)
         QMAKE_CFLAGS_DEBUG= -g
         QMAKE_CFLAGS_SHLIB=
         QMAKE_CFLAGS_YACC= -woff 1110,1174,3262
         QMAKE_CFLAGS_THREAD=
 
         QMAKE_CXX       = CC
-        QMAKE_CXXFLAGS  = -n32 -woff 1021,1209,1233,1314,1355,1375,1506,1681,1682,3496 $(CXXFLAGS_EXTRA)
+        QMAKE_CXXFLAGS  = -n32 -woff 1021,1209,1233,1314,1355,1375,1424,1506,1681,1682,3496 $(CXXFLAGS_EXTRA)
         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_INCDIR    =
         QMAKE_LIBDIR    =
         QMAKE_INCDIR_X11=
         QMAKE_LIBDIR_X11=
         QMAKE_INCDIR_QT         = $(QTDIR)/include
         QMAKE_LIBDIR_QT         = $(QTDIR)/lib
         QMAKE_INCDIR_OPENGL=
         QMAKE_LIBDIR_OPENGL=
 
         QMAKE_LINK      = CC
         QMAKE_LINK_SHLIB= CC
         QMAKE_LFLAGS    = -n32 $(LFLAGS_EXTRA)
         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      = $(LIBS_EXTRA)
         QMAKE_LIBS_DYNLOAD=
         QMAKE_LIBS_X11  = -lXext -lX11 -lm
         QMAKE_LIBS_X11SM= -lSM -lICE
         QMAKE_LIBS_QT   = -lqt
         QMAKE_LIBS_QT_THREAD= -lqt-mt
         QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu -lm
         QMAKE_LIBS_OPENGL_QT= -lGL -lXmu
         QMAKE_LIBS_THREAD= -lpthread
 
         QMAKE_MOC       = $(QTDIR)/bin/moc
         QMAKE_UIC       = $(QTDIR)/bin/uic
 
         QMAKE_AR        = CC -ar -o
         QMAKE_RANLIB    =
 
         QMAKE_CLEAN     = -r $(OBJECTS_DIR)so_locations $(OBJECTS_DIR)ii_files
 
         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/irix-cc/qplatformdefs.h b/mkspecs/irix-cc/qplatformdefs.h
index c6eaa2f..8666daf 100644
--- a/mkspecs/irix-cc/qplatformdefs.h
+++ b/mkspecs/irix-cc/qplatformdefs.h
@@ -14,75 +14,79 @@
 
 
 #ifdef QT_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 IRIX 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 <netinet/in.h>
 #include <arpa/nameser.h>
 #include <resolv.h>
 
 
 #if !defined(QT_NO_COMPAT)
         #define QT_STATBUF      struct stat
         #define QT_STATBUF4TSTATstruct 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_RETTYPEvoid
         #define QT_SIGNAL_ARGS  int
         #define QT_SIGNAL_IGNORESIG_IGN
 
+#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE-0 >= 500)
+        #define QT_SOCKLEN_T    size_t
+#else
         #define QT_SOCKLEN_T    int
+#endif
 
 #if 0
 // on Irix 6.5 and better only - but how to check for it?
 #if defined(_SGIAPI)
         #define QT_SNPRINTF     ::snprintf
         #define QT_VSNPRINTF    ::vsnprintf
 #endif
 #endif
 
 #endif // QPLATFORMDEFS_H