From d0c8ac8ec118270bbae29919103a57fd52c398c6 Mon Sep 17 00:00:00 2001 From: Peter Veenstra Date: Wed, 27 Jun 2007 19:14:59 +0000 Subject: [PATCH] Fix a few warnings. Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@2897 --- src/dos/dos_files.cpp | 4 ++-- src/dos/dos_mscdex.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/dos/dos_files.cpp b/src/dos/dos_files.cpp index 3fc64416..c92fe590 100644 --- a/src/dos/dos_files.cpp +++ b/src/dos/dos_files.cpp @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $Id: dos_files.cpp,v 1.87 2007-06-14 08:23:46 qbix79 Exp $ */ +/* $Id: dos_files.cpp,v 1.88 2007-06-27 19:14:59 qbix79 Exp $ */ #include #include @@ -690,7 +690,7 @@ Bit8u FCB_Parsename(Bit16u seg,Bit16u offset,Bit8u parser ,char *string, Bit8u * char drive[2]; char name[9]; char ext[4]; - } part GCC_ATTRIBUTE (packed) ; + } GCC_ATTRIBUTE (packed) part; char full[DOS_FCBNAME]; } fcb_name; #ifdef _MSC_VER diff --git a/src/dos/dos_mscdex.cpp b/src/dos/dos_mscdex.cpp index e1cf3784..2d582c7a 100644 --- a/src/dos/dos_mscdex.cpp +++ b/src/dos/dos_mscdex.cpp @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $Id: dos_mscdex.cpp,v 1.47 2007-06-12 20:22:08 c2woody Exp $ */ +/* $Id: dos_mscdex.cpp,v 1.48 2007-06-27 19:14:59 qbix79 Exp $ */ #include #include @@ -64,7 +64,7 @@ public: void SetDriveLetter (Bit8u letter) { sSave(sDeviceHeader,driveLetter,letter); }; void SetNumSubUnits (Bit8u num) { sSave(sDeviceHeader,numSubUnits,num); }; Bit8u GetNumSubUnits (void) { return sGet(sDeviceHeader,numSubUnits); }; - void SetName (char* _name) { MEM_BlockWrite(pt+offsetof(sDeviceHeader,name),_name,8); }; + void SetName (char const* _name) { MEM_BlockWrite(pt+offsetof(sDeviceHeader,name),_name,8); }; void SetInterrupt (Bit16u ofs) { sSave(sDeviceHeader,interrupt,ofs); }; void SetStrategy (Bit16u ofs) { sSave(sDeviceHeader,strategy,ofs); }; @@ -81,7 +81,7 @@ public: Bit16u wReserved; Bit8u driveLetter; Bit8u numSubUnits; - } TDeviceHeader; + } GCC_ATTRIBUTE(packed) TDeviceHeader; #ifdef _MSC_VER #pragma pack() #endif