patches/libgphoto2-04-pragma-pack.diff
author gman
Mon, 23 Oct 2006 08:58:13 +0000
changeset 8401 e51324814efa
parent 7256 39cb28ba817d
permissions -rw-r--r--
2006-10-23 Glynn Foster <[email protected]> * libgphoto2.spec: Update. * patches/libgphoto2-01-gettext.diff: Fix the fuzz. * patches/libgphoto2-03-solaris-mntent.diff: Re-diff. * patches/libgphoto2-04-pragma-pack.diff: Fix the fuzz. * patches/libgphoto2-05-dummy.diff: Change to a p1 because someone created a p0 instead. Bad.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
8401
e51324814efa 2006-10-23 Glynn Foster <[email protected]>
gman
parents: 7256
diff changeset
     1
diff -urN libgphoto2-2.2.1/camlibs/ptp2/library.c libgphoto2-2.2.1-hacked/camlibs/ptp2/library.c
e51324814efa 2006-10-23 Glynn Foster <[email protected]>
gman
parents: 7256
diff changeset
     2
--- libgphoto2-2.2.1/camlibs/ptp2/library.c	2006-06-16 17:08:21.000000000 +1200
e51324814efa 2006-10-23 Glynn Foster <[email protected]>
gman
parents: 7256
diff changeset
     3
+++ libgphoto2-2.2.1-hacked/camlibs/ptp2/library.c	2006-10-23 21:50:09.609424000 +1300
e51324814efa 2006-10-23 Glynn Foster <[email protected]>
gman
parents: 7256
diff changeset
     4
@@ -1715,6 +1715,7 @@
7256
39cb28ba817d 2006-05-11 Laszlo (Laca) Peter <[email protected]>
lp117937
parents:
diff changeset
     5
 	uint8_t		name[8];
39cb28ba817d 2006-05-11 Laszlo (Laca) Peter <[email protected]>
lp117937
parents:
diff changeset
     6
 	char		unknown2[8];
39cb28ba817d 2006-05-11 Laszlo (Laca) Peter <[email protected]>
lp117937
parents:
diff changeset
     7
 };
39cb28ba817d 2006-05-11 Laszlo (Laca) Peter <[email protected]>
lp117937
parents:
diff changeset
     8
+#pragma pack()
39cb28ba817d 2006-05-11 Laszlo (Laca) Peter <[email protected]>
lp117937
parents:
diff changeset
     9
 
8401
e51324814efa 2006-10-23 Glynn Foster <[email protected]>
gman
parents: 7256
diff changeset
    10
 #if 0 /* leave out ... is confusing -P downloads */
7256
39cb28ba817d 2006-05-11 Laszlo (Laca) Peter <[email protected]>
lp117937
parents:
diff changeset
    11
 static int