Ticket #378: quake3-io2306.patch

code/botlib/botlib.h

@@ -170 +170 @@
 typedef struct botlib_import_s
 {
         //print messages from the bot library
-        void            (QDECL *Print)(int type, char *fmt, ...) __attribute__ ((format (printf, 2, 3)));
+//      void            (QDECL *Print)(int type, char *fmt, ...) __attribute__ ((format (printf, 2, 3)));
+        void            (QDECL *Print)(int type, char *fmt, ...);
         //trace a bbox through the world
         void            (*Trace)(bsp_trace_t *trace, vec3_t start, vec3_t mins, vec3_t maxs, vec3_t end, int passent, int contentmask);
         //trace a bbox against a specific entity

code/qcommon/net_ip.c

@@ -73 +73 @@
 #       include <sys/types.h>
 #       include <sys/time.h>
 #       include <unistd.h>
-#       if !defined(__sun) && !defined(__sgi)
+#       if !defined(__sun) && !defined(__sgi) && !defined(__HAIKU__)
 #               include <ifaddrs.h>
 #       endif
 
@@ -132 +132 @@
 
 #define MAX_IPS         32
 
+#ifdef __HAIKU__
+        typedef uint8_t sa_family_t;
+#endif
+
 typedef struct
 {
         char ifname[IF_NAMESIZE];

code/qcommon/q_platform.h

@@ -35 +35 @@
 
 #else
 
-#if (defined _M_IX86 || defined __i386__) && !defined(C_ONLY)
+#if (defined _M_IX86 || defined __i386__) && !defined(C_ONLY) && !defined(__HAIKU__)
 #define id386 1
 #else
 #define id386 0
@@ -229 +229 @@
 
 #endif
 
+
+//================================================================= HAIKU ===
+
+#ifdef __HAIKU__
+
+#define OS_STRING "haiku"
+#define ID_INLINE inline
+#define PATH_SEP '/'
+#define ARCH_STRING "i386"
+#define Q3_LITTLE_ENDIAN
+#define DLL_EXT ".so"
+
+#endif
+
+
 //=================================================================== BSD ===
 
 #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)

code/renderer/tr_image_pcx.c

@@ -45 +45 @@
         unsigned short  palette_type;
         unsigned short  hscreensize, vscreensize;
         char    filler[54];
-        unsigned char   data[];
+        unsigned char   *data;
 } pcx_t;
 
 void R_LoadPCX ( const char *filename, byte **pic, int *width, int *height)

code/renderer/tr_public.h

@@ -106 +106 @@
 //
 typedef struct {
         // print message on the local console
-        void    (QDECL *Printf)( int printLevel, const char *fmt, ...) __attribute__ ((format (printf, 2, 3)));
+//      void    (QDECL *Printf)( int printLevel, const char *fmt, ...) __attribute__ ((format (printf, 2, 3)));
+        void    (QDECL *Printf)( int printLevel, const char *fmt, ...);
 
         // abort the game
-        void    (QDECL *Error)( int errorLevel, const char *fmt, ...) __attribute__ ((noreturn, format (printf, 2, 3)));
+//      void    (QDECL *Error)( int errorLevel, const char *fmt, ...) __attribute__ ((noreturn, format (printf, 2, 3)));
+        void    (QDECL *Error)( int errorLevel, const char *fmt, ...);
 
         // milliseconds should only be used for profiling, never
         // for anything game related.  Get time from the refdef

code/sys/sys_main.c

@@ -31 +31 @@
 #include <ctype.h>
 #include <errno.h>
 
+#ifdef __HAIKU__
+#define SIGIOT SIGABRT
+#endif
+
 #ifndef DEDICATED
 #ifdef USE_LOCAL_HEADERS
 #       include "SDL.h"

code/sys/sys_unix.c

@@ -39 +39 @@
 #include <fenv.h>
 #include <sys/wait.h>
 
+#ifdef __HAIKU__
+#define SIGIOT SIGABRT
+#endif
+
 qboolean stdinIsATTY;
 
 // Used to determine where to store user-specific files

code/tools/lcc/etc/lcc.c

@@ -48 +48 @@
 extern int suffix(char *, char *[], int);
 extern char *tempname(char *);
 
-#ifndef __sun
+#if !defined(__sun) && !defined(__HAIKU__)
 extern int getpid(void);
 #endif
 
@@ -279 +279 @@
 #else
 
 #define _P_WAIT 0
-#ifndef __sun
+#if !defined(__sun) && !defined(__HAIKU__)
 extern int fork(void);
 #endif
 extern int wait(int *);

code/ui/ui_shared.h

@@ -354 +354 @@
         void (*getBindingBuf)( int keynum, char *buf, int buflen );
         void (*setBinding)( int keynum, const char *binding );
         void (*executeText)(int exec_when, const char *text );  
-        void (*Error)(int level, const char *error, ...) __attribute__ ((noreturn, format (printf, 2, 3)));
-        void (*Print)(const char *msg, ...) __attribute__ ((format (printf, 1, 2)));
+//      void (*Error)(int level, const char *error, ...) __attribute__ ((noreturn, format (printf, 2, 3)));
+//      void (*Print)(const char *msg, ...) __attribute__ ((format (printf, 1, 2)));
+        void (*Error)(int level, const char *error, ...);
+        void (*Print)(const char *msg, ...);
         void (*Pause)(qboolean b);
         int (*ownerDrawWidth)(int ownerDraw, float scale);
         sfxHandle_t (*registerSound)(const char *name, qboolean compressed);

Makefile

@@ -396 +396 @@
 else # ifeq Linux
 
 #############################################################################
+# SETUP AND BUILD -- HAIKU
+#############################################################################
+
+## Defaults
+LIB=lib
+
+INSTALL=install
+MKDIR=mkdir
+
+ifeq ($(PLATFORM),haiku)
+
+  BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \
+    -pipe -DUSE_ICON $(shell sdl-config --cflags)
+
+  ifeq ($(USE_OPENAL),1)
+    BASE_CFLAGS += -DUSE_OPENAL
+    ifeq ($(USE_OPENAL_DLOPEN),1)
+      BASE_CFLAGS += -DUSE_OPENAL_DLOPEN
+    endif
+  endif
+
+  ifeq ($(USE_CURL),1)
+    BASE_CFLAGS += -DUSE_CURL
+    ifeq ($(USE_CURL_DLOPEN),1)
+      BASE_CFLAGS += -DUSE_CURL_DLOPEN
+    endif
+  endif
+
+  ifeq ($(USE_CODEC_VORBIS),1)
+    BASE_CFLAGS += -DUSE_CODEC_VORBIS
+  endif
+
+  OPTIMIZE = -O3 -ffast-math -funroll-loops -fomit-frame-pointer
+
+  ifeq ($(ARCH),i386)
+    OPTIMIZE = -O3 -march=i586 -fomit-frame-pointer -ffast-math \
+      -funroll-loops -falign-loops=2 -falign-jumps=2 \
+      -falign-functions=2 -fstrength-reduce
+    HAVE_VM_COMPILED=true
+  endif
+
+  ifneq ($(HAVE_VM_COMPILED),true)
+    BASE_CFLAGS += -DNO_VM_COMPILED
+  endif
+
+  SHLIBEXT=so
+  SHLIBCFLAGS=-fPIC
+  SHLIBLDFLAGS=-shared $(LDFLAGS)
+
+  THREAD_LDFLAGS=-lpthread
+  LDFLAGS=-lnetwork
+
+  CLIENT_LDFLAGS=$(shell sdl-config --libs) -lGL
+
+  ifeq ($(USE_OPENAL),1)
+    ifneq ($(USE_OPENAL_DLOPEN),1)
+      CLIENT_LDFLAGS += -lopenal
+    endif
+  endif
+
+  ifeq ($(USE_CURL),1)
+    ifneq ($(USE_CURL_DLOPEN),1)
+      CLIENT_LDFLAGS += -lcurl
+    endif
+  endif
+
+  ifeq ($(USE_CODEC_VORBIS),1)
+    CLIENT_LDFLAGS += -lvorbisfile -lvorbis -logg
+  endif
+
+  ifeq ($(ARCH),i386)
+    # linux32 make ...
+    BASE_CFLAGS += -m32
+    LDFLAGS+=-m32
+  endif
+
+  DEBUG_CFLAGS = $(BASE_CFLAGS) -g -O0
+  RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG $(OPTIMIZE)
+
+else # ifeq Haiku
+
+#############################################################################
 # SETUP AND BUILD -- MAC OS X
 #############################################################################
 
@@ -828 +910 @@
   SHLIBLDFLAGS=-shared
 
 endif #Linux
+endif #Haiku
 endif #darwin
 endif #mingw32
 endif #FreeBSD
@@ -989 +1072 @@
 
 BASE_CFLAGS += -DPRODUCT_VERSION=\\\"$(VERSION)\\\"
 BASE_CFLAGS += -Wformat=2 -Wno-format-zero-length -Wformat-security -Wno-format-nonliteral
-BASE_CFLAGS += -Wstrict-aliasing=2 -Wmissing-format-attribute
-BASE_CFLAGS += -Wdisabled-optimization
+#BASE_CFLAGS += -Wstrict-aliasing=2 -Wmissing-format-attribute
+#BASE_CFLAGS += -Wdisabled-optimization
 BASE_CFLAGS += -Werror-implicit-function-declaration
 
 ifeq ($(V),1)