SOURCES: nbd-types.patch (NEW) - fix conflicting types

qboosh qboosh at pld-linux.org
Sat Oct 29 15:53:41 CEST 2005


Author: qboosh                       Date: Sat Oct 29 13:53:41 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- fix conflicting types

---- Files affected:
SOURCES:
   nbd-types.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/nbd-types.patch
diff -u /dev/null SOURCES/nbd-types.patch:1.1
--- /dev/null	Sat Oct 29 15:53:41 2005
+++ SOURCES/nbd-types.patch	Sat Oct 29 15:53:36 2005
@@ -0,0 +1,31 @@
+--- nbd-2.8.1/gznbd/gznbd.c.orig	2005-10-27 19:39:06.000000000 +0200
++++ nbd-2.8.1/gznbd/gznbd.c	2005-10-29 15:50:12.000000000 +0200
+@@ -49,8 +49,10 @@
+ /* asm/types defines __u??, at least on my system */
+ #include <asm/types.h>
+ 
++/* defined in cliserv
+ #define u32 __u32
+ #define u64 __u64
++*/
+ 
+ /* these headers take care of endianness */
+ #include "../config.h"
+@@ -95,7 +97,7 @@
+       fprintf(stderr,"%s: %s does not appear to be a valid size\n",argv[0],argv[3]);
+       exit(1);
+     }
+-    printf("%s: file=%s, size=%Ld\n",argv[0],argv[2],size);
++    printf("%s: file=%s, size=%Ld\n",argv[0],argv[2],(long long)size);
+   } else {
+     char buffer[BLOCK];
+     int result;
+@@ -110,7 +112,7 @@
+     }
+ 
+     if(result==0){
+-      printf("size=%Ld\n",size);
++      printf("size=%Ld\n",(long long)size);
+     } else {
+       printf("failed\n");
+       if(result<0){
================================================================



More information about the pld-cvs-commit mailing list