valter/dosbox-staging
1
0
Fork 0
Code Releases Activity

gcc3.4 doesn't really like pragma pack

Browse source 
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@1940
This commit is contained in:
Peter Veenstra 2004-09-05 18:54:59 +00:00
parent e269c3d2ed
commit fa3d6daf04
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
include/paging.h
View file

@ -16,9 +16,12 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/* $Id: paging.h,v 1.10 2004-09-05 18:54:59 qbix79 Exp $ */
#ifndef _PAGING_H_
#define _PAGING_H_
#include "dosbox.h"
#include "mem.h"
class PageDirectory;
@ -70,7 +73,9 @@ bool PAGING_MakePhysPage(Bitu & page);
void MEM_SetLFB(Bitu _page,Bitu _pages,HostPt _pt);
void MEM_SetPageHandler(Bitu phys_page,Bitu pages,PageHandler * handler);
#pragma pack(1)
#ifdef _MSC_VER
#pragma pack (1)
#endif
typedef struct {
Bit32u p:1;
Bit32u wr:1;
@ -84,7 +89,10 @@ typedef struct {
Bit32u avl:3;
Bit32u base:20;
} X86_PageEntryBlock GCC_ATTRIBUTE(packed);
#pragma pack()
#ifdef _MSC_VER
#pragma pack ()
#endif
union X86PageEntry {
Bit32u load;