From: Shamus Hammons Date: Sat, 20 Mar 2004 19:15:35 +0000 (+0000) Subject: Small header sanity update X-Git-Tag: 1.0.7~55 X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d1f771d16daa368e567adc10e2b1868ab86be204;p=virtualjaguar Small header sanity update --- diff --git a/src/include/dac.h b/src/include/dac.h index 2af635f..22e0efc 100644 --- a/src/include/dac.h +++ b/src/include/dac.h @@ -5,6 +5,8 @@ #ifndef __DAC_H__ #define __DAC_H__ +#include "types.h" + void DACInit(void); void DACReset(void); void DACDone(void); diff --git a/src/include/gui.h b/src/include/gui.h index b531132..14fe212 100644 --- a/src/include/gui.h +++ b/src/include/gui.h @@ -7,6 +7,8 @@ #ifndef __GUI_H__ #define __GUI_H__ +#include "types.h" + #ifdef __cplusplus extern "C" { #endif diff --git a/src/include/log.h b/src/include/log.h index 52ccfe9..0804df9 100644 --- a/src/include/log.h +++ b/src/include/log.h @@ -6,8 +6,6 @@ #define __LOG_H__ #include -#include -#include #ifdef __cplusplus extern "C" { diff --git a/src/include/memory.h b/src/include/memory.h index 7c4f684..7ac56ec 100644 --- a/src/include/memory.h +++ b/src/include/memory.h @@ -1,29 +1,21 @@ -////////////////////////////////////////////////////////////////////////////// // -////////////////////////////////////////////////////////////////////////////// +// MEMORY.H: Header file // -// -// -// -// -// -////////////////////////////////////////////////////////////////////////////// #ifndef __MEMORY_H__ #define __MEMORY_H__ #include -#include -#include +//#include +//#include #include "types.h" -#include "log.h" - -void memory_init(void); -void memory_done(void); -void memory_malloc_secure(void **new_ptr, UINT32 size, char *info); -void *memory_malloc(UINT32 size, char *info); -void memory_free(void *ptr); -void memory_memoryUsage(FILE *fp); +//#include "log.h" +void InitMemory(void); +void MemoryDone(void); +void memory_malloc_secure(void ** new_ptr, UINT32 size, char * info); +void * memory_malloc(UINT32 size, char * info); +void memory_free(void * ptr); +void memory_memoryUsage(FILE * fp); #endif diff --git a/src/include/version.h b/src/include/version.h index 4edc424..0e26345 100644 --- a/src/include/version.h +++ b/src/include/version.h @@ -6,10 +6,9 @@ #define __VERSION_H__ #include -#include -void version_init(void); +void InitVersion(void); +void VersionDone(void); void version_display(FILE *); -void version_done(void); #endif // __VERSION_H__ diff --git a/src/include/video.h b/src/include/video.h index 2d9cafe..685a6d8 100644 --- a/src/include/video.h +++ b/src/include/video.h @@ -5,6 +5,8 @@ #ifndef __VIDEO_H__ #define __VIDEO_H__ +#include "types.h" + #define VIRTUAL_SCREEN_WIDTH 320 #define VIRTUAL_SCREEN_HEIGHT_NTSC 240 #define VIRTUAL_SCREEN_HEIGHT_PAL 256