From 3542bc465f326a7cc58d95543bcb666e952267a7 Mon Sep 17 00:00:00 2001
From: Ozkan Sezer <[EMAIL REDACTED]>
Date: Wed, 4 Oct 2023 17:56:56 +0300
Subject: [PATCH] gme/ext: remove unnecessary mamedef.h, add missing newlines
at end.
---
gme/ext/2413tone.h | 2 +-
gme/ext/emu2413.c | 2 --
gme/ext/mamedef.h | 62 ----------------------------------------------
gme/ext/panning.h | 2 +-
4 files changed, 2 insertions(+), 66 deletions(-)
delete mode 100644 gme/ext/mamedef.h
diff --git a/gme/ext/2413tone.h b/gme/ext/2413tone.h
index fb42e3f..c041dc9 100644
--- a/gme/ext/2413tone.h
+++ b/gme/ext/2413tone.h
@@ -17,4 +17,4 @@
0x21,0x01,0x89,0x03,0xf1,0xe4,0xf0,0x23,
0x07,0x21,0x14,0x00,0xee,0xf8,0xff,0xf8,
0x01,0x31,0x00,0x00,0xf8,0xf7,0xf8,0xf7,
-0x25,0x11,0x00,0x00,0xf8,0xfa,0xf8,0x55,
\ No newline at end of file
+0x25,0x11,0x00,0x00,0xf8,0xfa,0xf8,0x55,
diff --git a/gme/ext/emu2413.c b/gme/ext/emu2413.c
index e41753f..701dbde 100644
--- a/gme/ext/emu2413.c
+++ b/gme/ext/emu2413.c
@@ -55,8 +55,6 @@
#include <stdlib.h>
#include <string.h>
#include <math.h>
-#include "mamedef.h"
-#undef INLINE
#include "emu2413.h"
#include "panning.h" // Maxim
diff --git a/gme/ext/mamedef.h b/gme/ext/mamedef.h
deleted file mode 100644
index bc6cfbf..0000000
--- a/gme/ext/mamedef.h
+++ /dev/null
@@ -1,62 +0,0 @@
-#ifndef __MAMEDEF_H__
-#define __MAMEDEF_H__
-
-// typedefs to use MAME's (U)INTxx types (copied from MAME\src\ods\odscomm.h)
-/* 8-bit values */
-typedef unsigned char UINT8;
-typedef signed char INT8;
-
-/* 16-bit values */
-typedef unsigned short UINT16;
-typedef signed short INT16;
-
-/* 32-bit values */
-#ifndef _WINDOWS_H
-typedef unsigned int UINT32;
-typedef signed int INT32;
-#endif
-
-/* 64-bit values */
-#ifndef _WINDOWS_H
-#ifdef _MSC_VER
-typedef signed __int64 INT64;
-typedef unsigned __int64 UINT64;
-#else
-__extension__ typedef unsigned long long UINT64;
-__extension__ typedef signed long long INT64;
-#endif
-#endif
-
-/* offsets and addresses are 32-bit (for now...) */
-typedef UINT32 offs_t;
-
-/* stream_sample_t is used to represent a single sample in a sound stream */
-typedef INT32 stream_sample_t;
-
-#ifdef VGM_BIG_ENDIAN
-#define BYTE_XOR_BE(x) (x)
-#else
-#define BYTE_XOR_BE(x) ((x) ^ 0x01)
-#endif
-
-#if defined(_MSC_VER)
-//#define INLINE static __forceinline
-#define INLINE static __inline
-#elif defined(__GNUC__)
-#define INLINE static __inline__
-#else
-#define INLINE static inline
-#endif
-#ifndef M_PI
-#define M_PI 3.14159265358979323846
-#endif
-
-#ifdef _DEBUG
-#define logerror printf
-#else
-#define logerror
-#endif
-
-typedef void (*SRATE_CALLBACK)(void*, UINT32);
-
-#endif // __MAMEDEF_H__
diff --git a/gme/ext/panning.h b/gme/ext/panning.h
index b6bab25..59a33d3 100644
--- a/gme/ext/panning.h
+++ b/gme/ext/panning.h
@@ -10,4 +10,4 @@
void calc_panning(float channels[2], int position);
void centre_panning(float channels[2]);
-#endif
\ No newline at end of file
+#endif