[Cluster-devel] cluster cman/qdisk/disk_util.c rgmanager/Chang ...
fabbione at sourceware.org
fabbione at sourceware.org
Fri Apr 27 04:23:05 UTC 2007
CVSROOT: /cvs/cluster
Module name: cluster
Changes by: fabbione at sourceware.org 2007-04-27 05:23:05
Modified files:
cman/qdisk : disk_util.c
rgmanager : ChangeLog
rgmanager/src/clulib: vft.c
Log message:
Fix build on parisc
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/qdisk/disk_util.c.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/ChangeLog.diff?cvsroot=cluster&r1=1.38&r2=1.39
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/clulib/vft.c.diff?cvsroot=cluster&r1=1.19&r2=1.20
--- cluster/cman/qdisk/disk_util.c 2007/01/26 14:35:13 1.4
+++ cluster/cman/qdisk/disk_util.c 2007/04/27 04:23:05 1.5
@@ -71,7 +71,7 @@
if (!fp)
return -1;
-#if defined(__sparc__) || defined(__hppa__) || defined(__sparc64__) || defined (__hppa64__)
+#if defined(__sparc__) || defined(__sparc64__)
rv = fscanf(fp,"%ld.%d %ld.%d\n", &tv->tv_sec, &tv->tv_usec,
&junk.tv_sec, &junk.tv_usec);
#else
--- cluster/rgmanager/ChangeLog 2007/04/26 20:42:02 1.38
+++ cluster/rgmanager/ChangeLog 2007/04/27 04:23:05 1.39
@@ -1,3 +1,6 @@
+2007-04-27 Fabio M. Di Nitto <fabbione at ubuntu.com>
+ * src/clulib/vft.c: Change ifdef to fix build on parisc.
+
2007-04-26 Lon Hohberger <lhh at redhat.com>
* src/daemons/reslist.c: Try all direct ancestors while
performing run-time inheritance resolution #231521
--- cluster/rgmanager/src/clulib/vft.c 2007/03/28 14:54:12 1.19
+++ cluster/rgmanager/src/clulib/vft.c 2007/04/27 04:23:05 1.20
@@ -731,7 +731,7 @@
if (!fp)
return -1;
-#if defined(__sparc__) || defined(__hppa__) || defined(__sparc64__) || defined (__hppa64__)
+#if defined(__sparc__) || defined(__sparc64__)
rv = fscanf(fp,"%ld.%d %ld.%d\n", &tv->tv_sec, &tv->tv_usec,
&junk.tv_sec, &junk.tv_usec);
#else
More information about the Cluster-devel
mailing list