summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjcsjcs <jcsjcs@f01d2545-417e-4e96-918e-98f8d0dbbcb6>2006-02-19 10:13:17 +0000
committerjcsjcs <jcsjcs@f01d2545-417e-4e96-918e-98f8d0dbbcb6>2006-02-19 10:13:17 +0000
commit081ba99229e25db4418a2f4e63b71784d4d81e32 (patch)
treef7923277c30fe640c59116f5c0f8755e0546f3af
parent48c757d922239e1c4d8cb817899bfecac34e2c44 (diff)
downloadlibgpod-081ba99229e25db4418a2f4e63b71784d4d81e32.tar.gz
libgpod-081ba99229e25db4418a2f4e63b71784d4d81e32.tar.xz
libgpod-081ba99229e25db4418a2f4e63b71784d4d81e32.zip
* libgpod-1.0.pc: added gobject-2.0 to 'Requires:' list
* src/db-itunes-parser.h: add '#pragma pack(4)' to fix 64bit issue with padding (at least as a temporary fix). git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1206 f01d2545-417e-4e96-918e-98f8d0dbbcb6
-rw-r--r--ChangeLog7
-rw-r--r--src/db-itunes-parser.h6
2 files changed, 13 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 34b06e0..3d35af9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2005-02-14 Jorg Schuler <jcsjcs at users.sourceforge.net>
+ * libgpod-1.0.pc: added gobject-2.0 to 'Requires:' list
+
+ * src/db-itunes-parser.h: add '#pragma pack(4)' to fix 64bit issue
+ with padding (at least as a temporary fix).
+
+2005-02-14 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
* po/ja.po: updated Japanese catalog -- thanks to Kentaro Fukuchi
* src/ipod-device.c: (ipod_device_set_property): fixed bug that
diff --git a/src/db-itunes-parser.h b/src/db-itunes-parser.h
index 54ef6b5..a51af8b 100644
--- a/src/db-itunes-parser.h
+++ b/src/db-itunes-parser.h
@@ -29,6 +29,12 @@
#include <glib.h>
/*#include "ipod-db-parser.h"*/
+/* Make sure that 64bit integers do not get padded */
+/* FIXME: Obviously, this could also affect 16bit and 32bit integers,
+ but so far all 32bit inters seem to be aligned correctly without
+ padding. */
+#pragma pack(4)
+
#define ITUNESDB_MAX_SIZE 10 * 1024 * 1024
struct _MHeader {