Rip out all traces of nedmalloc. Sorry, XP users--it's time to upgrade to something newer than an OS from 2001 if this affects you.

git-svn-id: https://svn.eduke32.com/eduke32@4027 1a8010ca-5511-0410-912e-c29ae57300e0

polymer/eduke32/build/src/winbits.c

@@ -9,17 +9,10 @@
 #include "cache1d.h"
 #include "winbits.h"
 
-#ifndef DEBUGGINGAIDS
-# define DISABLE_EXCEPTIONS
-# include "nedmalloc.h"
-#endif
-
 #if defined(_M_X64) || defined(__amd64__) || defined(__x86_64__)
 # define EBACKTRACEDLL "ebacktrace1-64.dll"
-# define NEDMALLOCDLL "nedmalloc-64.dll"
 #else
 # define EBACKTRACEDLL "ebacktrace1.dll"
-# define NEDMALLOCDLL "nedmalloc.dll"
 #endif
 
 int32_t backgroundidle = 1;
@@ -34,8 +27,6 @@ static HANDLE instanceflag = NULL;
 
 static OSVERSIONINFOEX osv;
 
-static HMODULE nedhandle = NULL;
-
 static int32_t togglecomp = 1;
 
 //
@@ -188,19 +179,7 @@ static void ToggleDesktopComposition(BOOL compEnable)
 //
 void win_open(void)
 {
-#ifndef DEBUGGINGAIDS
+#ifdef DEBUGGINGAIDS
-    if ((nedhandle = LoadLibrary(NEDMALLOCDLL)))
-    {
-#ifdef __cplusplus
-        nedalloc::nedpool_t *(WINAPI *nedcreatepool)(size_t, int);
-        if ((nedcreatepool = (nedalloc::nedpool_t *(WINAPI *)(size_t, int))GetProcAddress(nedhandle, "nedcreatepool")))
-#else
-        nedpool *(WINAPI *nedcreatepool)(size_t, int);
-        if ((nedcreatepool = (void *)GetProcAddress(nedhandle, "nedcreatepool")))
-#endif
-            nedcreatepool(SYSTEM_POOL_SIZE, -1);
-    }
-#else
     LoadLibraryA(EBACKTRACEDLL);
 /*
         wm_msgbox("boo","didn't load backtrace DLL (code %d)\n", (int)GetLastError());
@@ -230,9 +209,6 @@ void win_init(void)
     }
 
     win_printversion();
-
-    if (nedhandle)
-        initprintf("Initialized nedmalloc\n");
 }
 
 void win_setvideomode(int32_t c)

polymer/eduke32/eduke32.vcxproj

@@ -89,11 +89,9 @@
     <ClInclude Include="build\include\gtkbits.h" />
     <ClInclude Include="build\include\kplib.h" />
     <ClInclude Include="build\include\lzwnew.h" />
-    <ClInclude Include="build\include\malloc.c.h" />
     <ClInclude Include="build\include\mdsprite.h" />
     <ClInclude Include="build\include\mmulti.h" />
     <ClInclude Include="build\include\mutex.h" />
-    <ClInclude Include="build\include\nedmalloc.h" />
     <ClInclude Include="build\include\osd.h" />
     <ClInclude Include="build\include\osxbits.h" />
     <ClInclude Include="build\include\osxmain.h" />

polymer/eduke32/eduke32.vcxproj.filters

@@ -102,9 +102,6 @@
     <ClInclude Include="build\include\lzwnew.h">
       <Filter>build\headers</Filter>
     </ClInclude>
-    <ClInclude Include="build\include\malloc.c.h">
-      <Filter>build\headers</Filter>
-    </ClInclude>
     <ClInclude Include="build\include\mdsprite.h">
       <Filter>build\headers</Filter>
     </ClInclude>
@@ -378,9 +375,6 @@
     <ClInclude Include="source\animvpx.h">
       <Filter>eduke32\headers</Filter>
     </ClInclude>
-    <ClInclude Include="build\include\nedmalloc.h">
-      <Filter>build\headers</Filter>
-    </ClInclude>
     <ClInclude Include="source\actors_inline.h">
       <Filter>eduke32\headers</Filter>
     </ClInclude>

polymer/eduke32/source/game.c

@@ -11051,11 +11051,7 @@ int32_t app_main(int32_t argc, const char **argv)
     int32_t i = 0, j;
     char cwd[BMAX_PATH];
 //    extern char datetimestring[];
-#ifdef NEDMALLOC
-    ENetCallbacks callbacks = { Bmalloc, Bfree, NULL };
-#else
     ENetCallbacks callbacks = { NULL, NULL, NULL };
-#endif
 
     G_ExtPreInit();
 

polymer/eduke32/source/sdlmusic.c

@@ -180,7 +180,7 @@ int32_t MUSIC_Init(int32_t SoundCard, int32_t Address)
 
         sz = (numargs+2)*sizeof(char *) + (c-command+1);
         sz = ((sz+pagesize-1)/pagesize)*pagesize;
-#if defined(NEDMALLOC) || defined(__APPLE__) || defined(__ANDROID__)
+#if defined(__APPLE__) || defined(__ANDROID__)
         external_midi_argv = Bcalloc(1,sz+pagesize);
         if (!external_midi_argv)
             goto fallback;