SOURCES: partimage-types.patch - avoid bogus "conflicting types" o...

[saq]

Author: saq                          Date: Thu Sep 22 20:41:50 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- avoid bogus "conflicting types" on amd64

---- Files affected:
SOURCES:
   partimage-types.patch (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SOURCES/partimage-types.patch
diff -u SOURCES/partimage-types.patch:1.3 SOURCES/partimage-types.patch:1.4
--- SOURCES/partimage-types.patch:1.3	Tue Aug  9 13:52:39 2005
+++ SOURCES/partimage-types.patch	Thu Sep 22 22:41:45 2005
@@ -43,3 +43,18 @@
  
  // ================================================
  // ================================================
+--- partimage-0.6.5_beta2/src/client/fs/fs_xfs.h.orig	2005-09-22 22:36:45.000000000 +0200
++++ partimage-0.6.5_beta2/src/client/fs/fs_xfs.h	2005-09-22 22:37:05.000000000 +0200
+@@ -149,8 +149,12 @@
+ typedef	__uint64_t	xfs_dfiloff_t;	// block number in a file 
+ typedef	__uint64_t	xfs_dfilblks_t;	// number of blocks in a file 
+ 
++#ifndef __u64
+ typedef uint64_t __u64;
++#endif
++#ifndef __s64
+ typedef int64_t  __s64;
++#endif
+ 
+ typedef __u64	xfs_off_t;
+ //typedef __s32	xfs32_off_t;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/partimage-types.patch?r1=1.3&r2=1.4&f=u