Fixed various compilation issues thrown when compiling with SUN Studi…

…o. Thanks yagisan.
skyjake · May 31, 2009 · 38cf331 · 38cf331
1 parent 1aeaf9c
commit 38cf331
Show file tree

Hide file tree

Showing 11 changed files with 163 additions and 155 deletions.
diff --git a/doomsday/engine/portable/include/gl_tga.h b/doomsday/engine/portable/include/gl_tga.h
@@ -35,9 +35,6 @@
 extern          "C" {
 #endif
 
-typedef unsigned char uchar; // 1 byte
-typedef unsigned short uint16_t; // 2 bytes
-
 enum {
     TGA_FALSE,
     TGA_TRUE,

diff --git a/doomsday/engine/portable/src/gl_tga.c b/doomsday/engine/portable/src/gl_tga.c
@@ -47,6 +47,8 @@
 
 // TYPES -------------------------------------------------------------------
 
+typedef unsigned char uchar; // 1 byte
+
 typedef struct {
     uchar           idLength; // Identification field size in bytes.
     uchar           colorMapType; // Type of the color map.

diff --git a/doomsday/engine/portable/src/r_things.c b/doomsday/engine/portable/src/r_things.c
@@ -507,7 +507,7 @@ void R_PreInitSprites(void)
                         Sys_GetSeconds() - startTime));
 }
 
-static void initSpriteDefs(const spriterecord_t** sprRecords, int num)
+static void initSpriteDefs(spriterecord_t* const * sprRecords, int num)
 {
     numSprites = num;
     if(sprites)

diff --git a/doomsday/plugins/common/src/hu_inventory.c b/doomsday/plugins/common/src/hu_inventory.c
@@ -27,7 +27,7 @@
  * hu_inventory.c: Heads-up display(s) for the player inventory.
  */
 
-#if __JHERETIC__ || __JHEXEN__
+#if defined(__JHERETIC__) || defined(__JHEXEN__)
 
 // HEADER FILES ------------------------------------------------------------
 

diff --git a/doomsday/plugins/common/src/p_inventory.c b/doomsday/plugins/common/src/p_inventory.c
@@ -28,7 +28,7 @@
  *       in the HUD code.
  */
 
-#if __JHERETIC__ || __JHEXEN__ || __JDOOM64__
+#if defined(__JHERETIC__) || defined(__JHEXEN__) || defined(__JDOOM64__)
 
 // HEADER FILES ------------------------------------------------------------
 

diff --git a/doomsday/plugins/common/src/p_svtexarc.c b/doomsday/plugins/common/src/p_svtexarc.c
@@ -221,7 +221,6 @@ material_t* SV_GetArchiveMaterial(int archivenum, int group)
         return P_ToPtr(DMU_MATERIAL,
             P_MaterialNumForName(matArchive.table[archivenum].name,
                                  matArchive.table[archivenum].mnamespace));
-    return NULL;
 }
 
 void SV_WriteMaterialArchive(void)

diff --git a/doomsday/plugins/common/src/p_xgline.c b/doomsday/plugins/common/src/p_xgline.c
@@ -1449,14 +1449,14 @@ int C_DECL XLTrav_ChangeWallMaterial(linedef_t* line, boolean dummy,
     // Is there a sidedef?
     if(info->iparm[2])
     {
-        if(P_GetPtrp(line, DMU_BACK_SECTOR) < 0)
+        if(!P_GetPtrp(line, DMU_BACK_SECTOR))
             return true;
 
         side = P_GetPtrp(line, DMU_SIDEDEF1);
     }
     else
     {
-        if(P_GetPtrp(line, DMU_FRONT_SECTOR) < 0)
+        if(!P_GetPtrp(line, DMU_FRONT_SECTOR))
             return true;
 
         side = P_GetPtrp(line, DMU_SIDEDEF0);

diff --git a/doomsday/plugins/dehread/src/dehmain.c b/doomsday/plugins/dehread/src/dehmain.c
@@ -5,7 +5,7 @@
  *
  *\author Copyright © 2003-2009 Jaakko Keränen <jaakko.keranen@iki.fi>
  *\author Copyright © 2006-2009 Daniel Swanson <danij@dengine.net>
- *\author Copyright © 1998-2003 Randy Heit. <rheit@iastate.edu> (Zdoom)
+ *\author Copyright © 1998-2003 Randy Heit <rheit@iastate.edu> (Zdoom)
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -755,7 +755,7 @@ int PatchThing(int thingy)
         { "Death", 5, SN_DEATH },
         { "Exploding", 9, SN_XDEATH },
         { "Respawn", 7, SN_RAISE },
-        { NULL, -1 }
+        { NULL, 0 }
     };
     // Flags can be specified by name (a .bex extension):
     static const struct {

diff --git a/doomsday/plugins/jdoom/src/p_oldsvg.c b/doomsday/plugins/jdoom/src/p_oldsvg.c
@@ -874,11 +874,11 @@ void SV_v19_LoadGame(char *savename)
     // Check version.
     memset(vcheck, 0, sizeof(vcheck));
     sprintf(vcheck, "version %i", SAVE_VERSION);
-    if(strcmp(savePtr, vcheck))
+    if(strcmp((const char*) savePtr, vcheck))
     {
         int                 saveVer;
 
-        sscanf(savePtr, "version %i", &saveVer);
+        sscanf((const char*) savePtr, "version %i", &saveVer);
         if(saveVer >= SAVE_VERSION_BASE)
         {
             // Must be from the wrong game.