Author: spouliot
Date: 2007-03-29 16:15:44 -0500 (Thu, 29 Mar 2007)
New Revision: 75175
Modified:
trunk/libgdiplus/src/ChangeLog
trunk/libgdiplus/src/bmpcodec.h
Log:
2007-03-29 Sebastien Pouliot <[EMAIL PROTECTED]>
* bmpcodec.h: Use __attribute__ ((packed)) instead of #pragma pack(2)
to make this work on the ARM architecture.
Modified: trunk/libgdiplus/src/ChangeLog
===================================================================
--- trunk/libgdiplus/src/ChangeLog 2007-03-29 21:07:47 UTC (rev 75174)
+++ trunk/libgdiplus/src/ChangeLog 2007-03-29 21:15:44 UTC (rev 75175)
@@ -1,5 +1,7 @@
-2007-03-29 Sebastien Pouliot <[EMAIL PROTECTED]>
+2007-03-29 Sebastien Pouliot <[EMAIL PROTECTED]>
+ * bmpcodec.h: Use __attribute__ ((packed)) instead of #pragma pack(2)
+ to make this work on the ARM architecture.
* metafile.h: Use __attribute__ ((packed)) instead of #pragma pack(2)
in the hope this construct works on the ARM architecture.
* tiffcodec.c: Fix TIFF crashes on SPARC (it's amazing what an integer
Modified: trunk/libgdiplus/src/bmpcodec.h
===================================================================
--- trunk/libgdiplus/src/bmpcodec.h 2007-03-29 21:07:47 UTC (rev 75174)
+++ trunk/libgdiplus/src/bmpcodec.h 2007-03-29 21:15:44 UTC (rev 75175)
@@ -5,7 +5,7 @@
* Sanjay Gupta ([EMAIL PROTECTED])
* Mark Steele ([EMAIL PROTECTED])
*
- * Copyright (C) Novell, Inc. 2003-2004.
+ * Copyright (C) 2003-2004, 2007 Novell, Inc (http://www.novell.com)
*/
#ifndef _BMPCODEC_H
@@ -21,10 +21,13 @@
#define BITMAPINFOHEADER_SIZE 40
#define BITMAPCOREHEADER_SIZE 12
+#ifndef __GNUC__
+ #pragma pack(2)
+#endif
+typedef struct
#ifdef __GNUC__
-# pragma pack(2)
+ __attribute__ ((packed))
#endif
-typedef struct
{
WORD bfType;
DWORD bfSize;
@@ -32,8 +35,8 @@
WORD bfReserved2;
DWORD bfOffBits;
} BITMAPFILEHEADER, *PBITMAPFILEHEADER, *LPBITMAPFILEHEADER;
-#ifdef __GNUC__
-# pragma pack()
+#ifndef __GNUC__
+ #pragma pack()
#endif
#define BFT_BITMAP 0x4d42
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches