summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib/util
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/util')
-rw-r--r--src/lib/util/avhuff.c2
-rw-r--r--src/lib/util/aviio.c1
-rw-r--r--src/lib/util/bitmap.c2
-rw-r--r--src/lib/util/bitmap.h1
-rw-r--r--src/lib/util/cdrom.c2
-rw-r--r--src/lib/util/chd.c2
-rw-r--r--src/lib/util/chdcd.c1
-rw-r--r--src/lib/util/chdcodec.c2
-rw-r--r--src/lib/util/corefile.c2
-rw-r--r--src/lib/util/corestr.h10
-rw-r--r--src/lib/util/coretmpl.h1
-rw-r--r--src/lib/util/cstrpool.c2
-rw-r--r--src/lib/util/delegate.c2
-rw-r--r--src/lib/util/delegate.h1
-rw-r--r--src/lib/util/flac.c3
-rw-r--r--src/lib/util/harddisk.c2
-rw-r--r--src/lib/util/huffman.c1
-rw-r--r--src/lib/util/opresolv.c2
-rw-r--r--src/lib/util/options.c1
-rw-r--r--src/lib/util/palette.c2
-rw-r--r--src/lib/util/png.c1
-rw-r--r--src/lib/util/tagmap.c2
-rw-r--r--src/lib/util/xmlfile.c2
-rw-r--r--src/lib/util/zippath.c1
24 files changed, 38 insertions, 10 deletions
diff --git a/src/lib/util/avhuff.c b/src/lib/util/avhuff.c
index d2642b99b35..6684c6d7ae9 100644
--- a/src/lib/util/avhuff.c
+++ b/src/lib/util/avhuff.c
@@ -58,6 +58,8 @@
***************************************************************************/
+#include <assert.h>
+
#include "avhuff.h"
#include "huffman.h"
#include "chd.h"
diff --git a/src/lib/util/aviio.c b/src/lib/util/aviio.c
index 7dd2e3bb9c1..0d0403809f8 100644
--- a/src/lib/util/aviio.c
+++ b/src/lib/util/aviio.c
@@ -9,6 +9,7 @@
***************************************************************************/
#include <stdlib.h>
+#include <assert.h>
#include "aviio.h"
diff --git a/src/lib/util/bitmap.c b/src/lib/util/bitmap.c
index 4d1f8502f50..a6e7b02f957 100644
--- a/src/lib/util/bitmap.c
+++ b/src/lib/util/bitmap.c
@@ -8,6 +8,8 @@
***************************************************************************/
+#include <assert.h>
+
#include "bitmap.h"
#include <new>
diff --git a/src/lib/util/bitmap.h b/src/lib/util/bitmap.h
index a82ec7eebfe..91d693124e1 100644
--- a/src/lib/util/bitmap.h
+++ b/src/lib/util/bitmap.h
@@ -15,7 +15,6 @@
#include "osdcore.h"
#include "palette.h"
-#include <assert.h>
//**************************************************************************
diff --git a/src/lib/util/cdrom.c b/src/lib/util/cdrom.c
index 15c10a44452..90024420555 100644
--- a/src/lib/util/cdrom.c
+++ b/src/lib/util/cdrom.c
@@ -16,6 +16,8 @@
***************************************************************************/
+#include <assert.h>
+
#include "cdrom.h"
#include <stdlib.h>
diff --git a/src/lib/util/chd.c b/src/lib/util/chd.c
index 43539103d33..c00daf7b7cf 100644
--- a/src/lib/util/chd.c
+++ b/src/lib/util/chd.c
@@ -8,6 +8,8 @@
***************************************************************************/
+#include <assert.h>
+
#include "chd.h"
#include "avhuff.h"
#include "hashing.h"
diff --git a/src/lib/util/chdcd.c b/src/lib/util/chdcd.c
index 8690cc65ffa..0e6077dd70f 100644
--- a/src/lib/util/chdcd.c
+++ b/src/lib/util/chdcd.c
@@ -10,6 +10,7 @@
#include <ctype.h>
#include <stdlib.h>
+#include <assert.h>
#include "osdcore.h"
#include "chd.h"
#include "chdcd.h"
diff --git a/src/lib/util/chdcodec.c b/src/lib/util/chdcodec.c
index e1a001e2ebd..3bf1d6dfd63 100644
--- a/src/lib/util/chdcodec.c
+++ b/src/lib/util/chdcodec.c
@@ -8,6 +8,8 @@
***************************************************************************/
+#include <assert.h>
+
#include "chd.h"
#include "hashing.h"
#include "avhuff.h"
diff --git a/src/lib/util/corefile.c b/src/lib/util/corefile.c
index 977024b5143..abba0a6b5b9 100644
--- a/src/lib/util/corefile.c
+++ b/src/lib/util/corefile.c
@@ -8,6 +8,8 @@
***************************************************************************/
+#include <assert.h>
+
#include "corefile.h"
#include "unicode.h"
#include <zlib.h>
diff --git a/src/lib/util/corestr.h b/src/lib/util/corestr.h
index dad4880b268..e9750b5f85f 100644
--- a/src/lib/util/corestr.h
+++ b/src/lib/util/corestr.h
@@ -26,11 +26,11 @@ int core_stricmp(const char *s1, const char *s2);
/* this macro prevents people from using stricmp directly */
#undef stricmp
-#define stricmp !MUST_USE_CORE_STRICMP_INSTEAD!
+#define stricmp MUST_USE_CORE_STRICMP_INSTEAD
/* this macro prevents people from using strcasecmp directly */
#undef strcasecmp
-#define strcasecmp !MUST_USE_CORE_STRICMP_INSTEAD!
+#define strcasecmp MUST_USE_CORE_STRICMP_INSTEAD
/* since strnicmp is not part of the standard, we use this instead */
@@ -38,11 +38,11 @@ int core_strnicmp(const char *s1, const char *s2, size_t n);
/* this macro prevents people from using strnicmp directly */
#undef strnicmp
-#define strnicmp !MUST_USE_CORE_STRNICMP_INSTEAD!
+#define strnicmp MUST_USE_CORE_STRNICMP_INSTEAD
/* this macro prevents people from using strncasecmp directly */
#undef strncasecmp
-#define strncasecmp !MUST_USE_CORE_STRNICMP_INSTEAD!
+#define strncasecmp MUST_USE_CORE_STRNICMP_INSTEAD
/* since strdup is not part of the standard, we use this instead - free with osd_free() */
@@ -50,7 +50,7 @@ char *core_strdup(const char *str);
/* this macro prevents people from using strdup directly */
#undef strdup
-#define strdup !MUST_USE_CORE_STRDUP_INSTEAD!
+#define strdup MUST_USE_CORE_STRDUP_INSTEAD
/* additional string compare helper (up to 16 characters at the moment) */
diff --git a/src/lib/util/coretmpl.h b/src/lib/util/coretmpl.h
index e1dd388511b..93c71f0c84b 100644
--- a/src/lib/util/coretmpl.h
+++ b/src/lib/util/coretmpl.h
@@ -13,7 +13,6 @@
#ifndef __CORETMPL_H__
#define __CORETMPL_H__
-#include <assert.h>
#include "osdcore.h"
#include "corealloc.h"
diff --git a/src/lib/util/cstrpool.c b/src/lib/util/cstrpool.c
index 874e5192ea0..ea5c637e4d4 100644
--- a/src/lib/util/cstrpool.c
+++ b/src/lib/util/cstrpool.c
@@ -6,6 +6,8 @@
***************************************************************************/
+#include <assert.h>
+
#include "cstrpool.h"
diff --git a/src/lib/util/delegate.c b/src/lib/util/delegate.c
index ad66cc09168..6c688f72985 100644
--- a/src/lib/util/delegate.c
+++ b/src/lib/util/delegate.c
@@ -8,6 +8,8 @@
***************************************************************************/
+#include <assert.h>
+
#include "osdcomm.h"
#include "delegate.h"
diff --git a/src/lib/util/delegate.h b/src/lib/util/delegate.h
index 8cfd1c7485c..3b413456709 100644
--- a/src/lib/util/delegate.h
+++ b/src/lib/util/delegate.h
@@ -79,7 +79,6 @@
#define __DELEGATE_H__
// standard C++ includes
-#include <assert.h>
#include <exception>
#include <typeinfo>
diff --git a/src/lib/util/flac.c b/src/lib/util/flac.c
index 09e396c944e..d2f576e637e 100644
--- a/src/lib/util/flac.c
+++ b/src/lib/util/flac.c
@@ -8,8 +8,9 @@
***************************************************************************/
-#include "flac.h"
#include <assert.h>
+
+#include "flac.h"
#include <new>
diff --git a/src/lib/util/harddisk.c b/src/lib/util/harddisk.c
index 87967d41f1b..46d8f5bab9a 100644
--- a/src/lib/util/harddisk.c
+++ b/src/lib/util/harddisk.c
@@ -8,6 +8,8 @@
***************************************************************************/
+#include <assert.h>
+
#include "harddisk.h"
#include <stdlib.h>
diff --git a/src/lib/util/huffman.c b/src/lib/util/huffman.c
index eee176e13ba..2da37df8194 100644
--- a/src/lib/util/huffman.c
+++ b/src/lib/util/huffman.c
@@ -97,6 +97,7 @@
***************************************************************************/
#include <stdlib.h>
+#include <assert.h>
#include "coretmpl.h"
#include "huffman.h"
diff --git a/src/lib/util/opresolv.c b/src/lib/util/opresolv.c
index 4d093a955da..b7870842b08 100644
--- a/src/lib/util/opresolv.c
+++ b/src/lib/util/opresolv.c
@@ -6,10 +6,10 @@
****************************************************************************/
-#include <assert.h>
#include <ctype.h>
#include <stdlib.h>
#include <string.h>
+#include <assert.h>
#include "pool.h"
#include "corestr.h"
diff --git a/src/lib/util/options.c b/src/lib/util/options.c
index 96315678471..ba580c9ee3a 100644
--- a/src/lib/util/options.c
+++ b/src/lib/util/options.c
@@ -11,6 +11,7 @@
#include <stdarg.h>
#include <stdlib.h>
#include <ctype.h>
+#include <assert.h>
#include "options.h"
#include "astring.h"
diff --git a/src/lib/util/palette.c b/src/lib/util/palette.c
index 6b3847f61da..4be66ee9f7b 100644
--- a/src/lib/util/palette.c
+++ b/src/lib/util/palette.c
@@ -8,6 +8,8 @@
******************************************************************************/
+#include <assert.h>
+
#include "palette.h"
#include <stdlib.h>
#include <math.h>
diff --git a/src/lib/util/png.c b/src/lib/util/png.c
index b88af8df44b..076b1b02965 100644
--- a/src/lib/util/png.c
+++ b/src/lib/util/png.c
@@ -10,6 +10,7 @@
#include <math.h>
#include <stdlib.h>
+#include <assert.h>
#include <zlib.h>
#include "png.h"
diff --git a/src/lib/util/tagmap.c b/src/lib/util/tagmap.c
index c3f1ad304db..c8247899dcc 100644
--- a/src/lib/util/tagmap.c
+++ b/src/lib/util/tagmap.c
@@ -8,6 +8,8 @@
***************************************************************************/
+#include <assert.h>
+
#include "tagmap.h"
#ifdef MAME_DEBUG
diff --git a/src/lib/util/xmlfile.c b/src/lib/util/xmlfile.c
index 2c8d78cdcdb..e03893134f9 100644
--- a/src/lib/util/xmlfile.c
+++ b/src/lib/util/xmlfile.c
@@ -8,6 +8,8 @@
***************************************************************************/
+#include <assert.h>
+
#include "xmlfile.h"
#include <ctype.h>
#include <expat.h>
diff --git a/src/lib/util/zippath.c b/src/lib/util/zippath.c
index d0f5931658d..e5e563cdbde 100644
--- a/src/lib/util/zippath.c
+++ b/src/lib/util/zippath.c
@@ -9,6 +9,7 @@
#include <ctype.h>
#include <stdlib.h>
#include <new>
+#include <assert.h>
#include "zippath.h"
#include "unzip.h"
#include "corestr.h"