- added some default definitions for constants that may miss in some headers.

- replaced __va_copy with va_copy per Chris's suggestion.
- replaced #include <malloc.h> with #include <stdlib.h> where possible.


SVN r1524 (trunk)

docs/rh-log.txt

@@ -1,4 +1,9 @@
-April 6, 2009  (Changes by Graf Zahl)
+April 7, 2009  (Changes by Graf Zahl)
+- added some default definitions for constants that may miss in some headers.
+- replaced __va_copy with va_copy per Chris's suggestion.
+- replaced #include <malloc.h> with #include <stdlib.h> where possible.
+
+April 6, 2009  (Changes by Graf Zahl)
 - Fixed: The UDMF textmap readbuffer was never freed.
 
 April 4, 2009

dumb/src/it/readxm.c

@@ -24,7 +24,7 @@
 #include "dumb.h"
 #include "internal/it.h"
 
-#include <malloc.h>
+#include <stdlib.h>
 #include <assert.h>
 
 extern short *DUMBCALLBACK dumb_decode_vorbis(int outlen, const void *oggstream, int sizebytes);

src/b_func.cpp

@@ -5,7 +5,7 @@
 * bot need to work             *
 *******************************/
 
-#include <malloc.h>
+#include <stdlib.h>
 
 #include "doomtype.h"
 #include "doomdef.h"

src/f_finale.cpp

@@ -25,7 +25,7 @@
 
 #include <ctype.h>
 #include <math.h>
-#include <malloc.h>
+#include <stdlib.h>
 
 #include "i_system.h"
 #include "m_swap.h"

src/farchive.cpp

@@ -43,7 +43,7 @@
 #include <stddef.h>
 #include <string.h>
 #include <zlib.h>
-#include <malloc.h>
+#include <stdlib.h>
 
 #include "doomtype.h"
 #include "farchive.h"

src/i_net.cpp

@@ -81,8 +81,11 @@ typedef int SOCKET;
 #define WSAGetLastError()	errno
 #endif
 
-#ifdef __WIN32__
+#ifndef IPPORT_USERRESERVED
 #define IPPORT_USERRESERVED 5000
+#endif
+
+#ifdef __WIN32__
 typedef int socklen_t;
 #endif
 

src/m_alloc.cpp

@@ -32,7 +32,7 @@
 **
 */
 
-#include <malloc.h>
+#include <stdlib.h>
 #include "i_system.h"
 #include "dobject.h"
 

src/m_misc.cpp

@@ -29,7 +29,7 @@
 #include <fcntl.h>
 #include <stdlib.h>
 #include <errno.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <time.h>
 
 #include "doomtype.h"

src/nodebuild.cpp

@@ -39,7 +39,7 @@
 
 #include <stdlib.h>
 #include <assert.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <math.h>

src/oplsynth/mlopl.cpp

@@ -43,7 +43,7 @@
 *		Added modulation wheel (vibrato) support
 */
 
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 #ifdef _WIN32
 #include <io.h>

src/r_things.cpp

@@ -23,7 +23,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <malloc.h>
 
 #include "templates.h"
 #include "doomdef.h"

src/sound/fmodsound.cpp

@@ -44,7 +44,7 @@ extern HWND Window;
 #define FALSE 0
 #define TRUE 1
 #endif
-#include <malloc.h>
+#include <stdlib.h>
 
 #include "templates.h"
 #include "fmodsound.h"

src/sound/i_musicinterns.h

@@ -14,7 +14,6 @@
 #define FALSE 0
 #define TRUE 1
 #endif
-#include <fmod.h>
 #include "tempfiles.h"
 #include "oplsynth/opl_mus_player.h"
 #include "c_cvars.h"

src/sound/music_midi_timidity.cpp

@@ -34,6 +34,7 @@ private:
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <wordexp.h>
+#include <signal.h>
 
 int ChildQuit;
 

src/sound/music_mus_midiout.cpp

@@ -33,7 +33,7 @@
 
 // HEADER FILES ------------------------------------------------------------
 
-#include <malloc.h>
+#include <stdlib.h>
 #include "i_musicinterns.h"
 #include "templates.h"
 #include "doomdef.h"

src/tempfiles.cpp

@@ -33,7 +33,7 @@
 */
 
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include "tempfiles.h"
 
 FTempFileName::FTempFileName (const char *prefix)

src/timidity/resample.cpp

@@ -23,7 +23,7 @@
 
 #include <math.h>
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 
 #include "timidity.h"
 #include "c_cvars.h"

src/v_draw.cpp

@@ -360,7 +360,7 @@ bool DCanvas::ParseDrawTextureTags (FTexture *img, int x, int y, DWORD tag, va_l
 			more_p = va_arg (tags, va_list *);
 			va_end (tags);
 #ifdef __GNUC__
-			__va_copy (tags, *more_p);
+			va_copy (tags, *more_p);
 #else
 			tags = *more_p;
 #endif

src/v_text.cpp

@@ -137,7 +137,7 @@ void STACK_ARGS DCanvas::DrawText (FFont *font, int normalcolor, int x, int y, c
 			more_p = va_arg (tags, va_list*);
 			va_end (tags);
 #ifdef __GNUC__
-			__va_copy (tags, *more_p);
+			va_copy (tags, *more_p);
 #else
 			tags = *more_p;
 #endif

src/win32/i_main.cpp

@@ -45,7 +45,7 @@
 //#include <wtsapi32.h>
 #define NOTIFY_FOR_THIS_SESSION 0
 
-#include <malloc.h>
+#include <stdlib.h>
 #ifdef _MSC_VER
 #include <eh.h>
 #include <new.h>

src/zstrformat.cpp

@@ -86,7 +86,7 @@
 #include <stddef.h>
 #include <stdlib.h>
 #include <math.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <locale.h>
 
 #include "zstring.h"

tools/zipdir/zipdir.c

@@ -88,6 +88,10 @@ static unsigned int LittleLong(unsigned int x)
 // Buffer size for central directory search
 #define BUFREADCOMMENT	(0x400)
 
+#ifndef PATH_MAX
+#define PATH_MAX 4096
+#endif
+
 // TYPES -------------------------------------------------------------------
 
 typedef struct file_entry_s