merge fceu-memory.c

src/drivers/libretro/fceu/fceu-memory.c

@@ -1,63 +0,0 @@
-/* FCE Ultra - NES/Famicom Emulator
- *
- * Copyright notice for this file:
- *  Copyright (C) 2002 Xodnizel
- *
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#include <stdlib.h>
-
-#include "fceu-types.h"
-#include "fceu.h"
-#include "fceu-memory.h"
-#include "general.h"
-
-void *FCEU_gmalloc(uint32 size)
-{
-   void *ret;
-   ret = malloc(size);
-   if (!ret)
-   {
-      FCEU_PrintError("Error allocating memory!  Doing a hard exit.");
-      exit(1);
-   }
-   return ret;
-}
-
-void *FCEU_malloc(uint32 size)
-{
-   int retval = 0;
-   void *ret;
-   ret = (void*)malloc(size);
-
-   if (!ret)
-   {
-      FCEU_PrintError("Error allocating memory!");
-      ret = 0;
-   }
-
-   return ret;
-}
-
-void FCEU_free(void *ptr)
-{
-	free(ptr);
-}
-
-void FCEU_gfree(void *ptr)
-{
-	free(ptr);
-}

src/drivers/libretro/griffin.c

@@ -9,7 +9,7 @@
 #include "crc32.c"
 #include "debug.c"
 #include "fceu-endian.c"
-#include "drivers/libretro/fceu/fceu-memory.c"
+#include "fceu-memory.c"
 #include "misc.c"
 #include "fceu.c"
 //#include "fceustr.c"