From e80222f29bbf420e1c32e57eb9743c9b3723fe83 Mon Sep 17 00:00:00 2001
From: Peter Veenstra <qbix79@users.sourceforge.net>
Date: Thu, 24 Mar 2005 10:11:18 +0000
Subject: [PATCH] New include system + Removed stddef.h from dosbox.h , added
 it to core_dyn_x86.cpp

Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@2135
---
 include/dosbox.h         | 16 +++++++---------
 include/logging.h        |  7 +++----
 src/cpu/core_dyn_x86.cpp |  1 +
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/include/dosbox.h b/include/dosbox.h
index 24ea7f9c..8adc942d 100644
--- a/include/dosbox.h
+++ b/include/dosbox.h
@@ -16,16 +16,15 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#if !defined __DOSBOX_H
-#define __DOSBOX_H
+#ifndef DOSBOX_DOSBOX_H
+#define DOSBOX_DOSBOX_H
+
+#include "config.h"
 
 void E_Exit(char * message,...);
 
 void MSG_Add(const char*,const char*); //add messages to the internal langaugefile
-const char* MSG_Get(char const *);         //get messages from the internal langaugafile
-
-#include <stddef.h>
-#include "config.h"
+const char* MSG_Get(char const *);     //get messages from the internal langaugafile
 
 class Section;
 
@@ -50,9 +49,8 @@ enum MachineType {
 extern MachineType machine;
 extern bool SDLNetInited;
 
-#ifndef __LOGGING_H_
+#ifndef DOSBOX_LOGGING_H
 #include "logging.h"
 #endif // the logging system.
 
-#endif /* __DOSBOX_H */
-
+#endif /* DOSBOX_DOSBOX_H */
diff --git a/include/logging.h b/include/logging.h
index ecac37d9..81ee2531 100644
--- a/include/logging.h
+++ b/include/logging.h
@@ -1,5 +1,5 @@
-#ifndef __LOGGING_H_
-#define __LOGGING_H_
+#ifndef DOSBOX_LOGGING_H
+#define DOSBOX_LOGGING_H
 enum LOG_TYPES {
 	LOG_ALL,
 	LOG_VGA, LOG_VGAGFX,LOG_VGAMISC,LOG_INT10,
@@ -63,5 +63,4 @@ void GFX_ShowMsg(char * format,...);
 #endif //C_DEBUG
 
 
-#endif //__LOGGING_H_
-
+#endif //DOSBOX_LOGGING_H
diff --git a/src/cpu/core_dyn_x86.cpp b/src/cpu/core_dyn_x86.cpp
index fab89029..4a9b2094 100644
--- a/src/cpu/core_dyn_x86.cpp
+++ b/src/cpu/core_dyn_x86.cpp
@@ -24,6 +24,7 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
+#include <stddef.h>
 
 #include "callback.h"
 #include "regs.h"