[Fakeroot-commits] [SCM] fakeroot branch, upstream, updated. debian/1.14.3-200-gb232f8a

[Clint Adams]

The following commit has been merged in the upstream branch:
commit aa2a027fb177101bdea3589dde6c57d5dcb29398
Author: Clint Adams <schizo at debian.org>
Date:   Mon Jan 21 22:19:21 2008 +0000

    Apply patch from Andrew Benham to handle padding under Sun Studio on Solaris.
    
    git-archimport-id: fakeroot at packages.debian.org--fakeroot/fakeroot--main--0.0--patch-158

diff --git a/debian/changelog b/debian/changelog
index 20d22c0..193abe2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+fakeroot (1.9.1) unstable; urgency=low
+
+  * Apply patch from Andrew Benham to handle padding under Sun Studio
+    on Solaris.
+
+ -- Clint Adams <schizo at debian.org>  Mon, 21 Jan 2008 17:16:22 -0500
+
 fakeroot (1.9) unstable; urgency=low
 
   * Bump to Standards-Version 3.7.3. 
diff --git a/message.h b/message.h
index cdb51b6..83ca184 100644
--- a/message.h
+++ b/message.h
@@ -30,6 +30,9 @@ typedef uint32_t fake_gid_t;
 typedef uint32_t fake_mode_t;
 typedef uint32_t fake_nlink_t;
 
+#if __SUNPRO_C
+#pragma pack(4)
+#endif
 struct fakestat {
 	fake_uid_t   uid;
 	fake_gid_t   gid;
@@ -39,7 +42,13 @@ struct fakestat {
 	fake_mode_t  mode;
 	fake_nlink_t nlink;
 } FAKEROOT_ATTR(packed);
+#if __SUNPRO_C
+#pragma pack()
+#endif
 
+#if __SUNPRO_C
+#pragma pack(4)
+#endif
 struct fake_msg {
 #ifndef FAKEROOT_FAKENET
 	long mtype; /* message type in SYSV message sending */
@@ -52,5 +61,8 @@ struct fake_msg {
 	struct fakestat st;
 	uint32_t        remote;
 } FAKEROOT_ATTR(packed);
+#if __SUNPRO_C
+#pragma pack()
+#endif
 
 #endif

-- 
fakeroot