- move includes of standard headers stdlib, stdio, etc. before the include of
bochs.h. Bernd Korz reported redefinition of Bit32u in the system header files, which I never saw before I moved bochs.h up above the other includes. - The exact errors: /boot/develop/headers/posix/be_prim.h:23: error: conflicting types for `typedef long unsigned int Bit32u' /boot/home/Entwicklung/Sourcecodes/bochs/config.h:474: error: previous declaration as `typedef unsigned int Bit32u'
This commit is contained in:
parent
1a10b8f87b
commit
b079f4ace2
@ -1,5 +1,5 @@
|
||||
/////////////////////////////////////////////////////////////////////////
|
||||
// $Id: beos.cc,v 1.21 2002-11-19 05:47:44 bdenney Exp $
|
||||
// $Id: beos.cc,v 1.22 2002-11-22 15:14:39 bdenney Exp $
|
||||
/////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Copyright (C) 2001 MandrakeSoft S.A.
|
||||
@ -30,6 +30,11 @@
|
||||
// is used to know when we are exporting symbols and when we are importing.
|
||||
#define BX_PLUGGABLE
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <ctype.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "bochs.h"
|
||||
#if BX_WITH_BEOS
|
||||
|
||||
@ -40,12 +45,6 @@
|
||||
#include <interface/Bitmap.h>
|
||||
#include <interface/GraphicsDefs.h>
|
||||
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <ctype.h>
|
||||
#include <string.h>
|
||||
|
||||
//#include "icon_bochs.h"
|
||||
#include "font/vga.bitmap.h"
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user