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
This commit is contained in:
parent
b42c189ac6
commit
e80222f29b
3 changed files with 11 additions and 13 deletions
|
@ -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 */
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -24,6 +24,7 @@
|
|||
#include <stdarg.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <stddef.h>
|
||||
|
||||
#include "callback.h"
|
||||
#include "regs.h"
|
||||
|
|
Loading…
Add table
Reference in a new issue