some warnings fixed, nsf fixed, palettes, more code backported

[fceu.git] / memory.h

diff --git a/memory.h b/memory.h
index 32df99a..a0c104a 100644 (file)
--- a/memory.h
+++ b/memory.h
@@ -1,7 +1,7 @@
 /* FCE Ultra - NES/Famicom Emulator
  *
  * Copyright notice for this file:
- *  Copyright (C) 2002 Ben Parnell
+ *  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
@@ -18,14 +18,14 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/*              Various macros for faster memory stuff
-               (at least that's the idea)
+/*        Various macros for faster memory stuff
+               (at least that's the idea) 
 */
 
 #define FCEU_dwmemset(d,c,n) {int _x; for(_x=n-4;_x>=0;_x-=4) *(uint32 *)&(d)[_x]=c;}
 
 void *FCEU_malloc(uint32 size);
+void *FCEU_gmalloc(uint32 size);
+void FCEU_gfree(void *ptr);
 void FCEU_free(void *ptr);
-#define FCEU_gmalloc FCEU_malloc
-#define FCEU_gfree FCEU_free
 void FASTAPASS(3) FCEU_memmove(void *d, void *s, uint32 l);