diff --git a/etlib/hash.c b/etlib/hash.c index 783727f7b..92c0f0701 100644 --- a/etlib/hash.c +++ b/etlib/hash.c @@ -1,7 +1,6 @@ #include <stdlib.h> #include <string.h> #include "etlib/generic.h" -#include "etlib/xmalloc.h" #include "etlib/hash.h" /* diff --git a/src/include/Module.make b/src/include/Module.make index dd52a3089..b4c89ffb8 100644 --- a/src/include/Module.make +++ b/src/include/Module.make @@ -1,2 +1,2 @@ HDRS += src/include/actions.h src/include/ai.h src/include/avi.h src/include/campaign.h src/include/script.h src/include/ccl_sound.h src/include/cdaudio.h src/include/commands.h src/include/construct.h src/include/cursor.h src/include/deco.h src/include/depend.h src/include/editor.h src/include/font.h src/include/stratagus.h src/include/icons.h src/include/interface.h src/include/iocompat.h src/include/iolib.h src/include/libcda.h src/include/map.h src/include/master.h src/include/menus.h src/include/minimap.h src/include/missile.h src/include/movie.h src/include/myendian.h src/include/net_lowlevel.h src/include/netconnect.h src/include/network.h src/include/pathfinder.h src/include/player.h src/include/pud.h src/include/rdtsc.h src/include/settings.h src/include/sound.h src/include/sound_id.h src/include/sound_server.h src/include/spells.h src/include/tileset.h src/include/trigger.h src/include/ui.h src/include/unit.h src/include/unitsound.h src/include/unittype.h src/include/upgrade.h src/include/upgrade_structs.h src/include/video.h src/include/wav.h -HDRS += src/include/etlib/dllist.h src/include/etlib/generic.h src/include/etlib/hash.h src/include/etlib/xmalloc.h +HDRS += src/include/etlib/dllist.h src/include/etlib/generic.h src/include/etlib/hash.h diff --git a/src/include/etlib/xmalloc.h b/src/include/etlib/xmalloc.h deleted file mode 100644 index 852999fc1..000000000 --- a/src/include/etlib/xmalloc.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef ETLIB_XMALLOC_H -#define ETLIB_XMALLOC_H -#ifndef _MSC_VER -#include <sys/types.h> -#endif - -extern void* xmalloc(size_t size); -extern void* xcalloc(size_t nelem, size_t elem_size); -extern void* xrealloc(void* ptr, size_t new_size); -extern void* xfree(void* ptr); -extern void* xstrdup(void* str); - -#endif /* ETLIB_XMALLOC_H */