[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.02-2-gc04bde3

[fabbione at sourceware.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cluster Project".

http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=c04bde3821f7cfdf71ac7f376e7a664fc3b11bec

The branch, master has been updated
       via  c04bde3821f7cfdf71ac7f376e7a664fc3b11bec (commit)
      from  2dd250b4ffba38c37d4634c02789ff2705327454 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c04bde3821f7cfdf71ac7f376e7a664fc3b11bec
Author: Fabio M. Di Nitto <fdinitto at redhat.com>
Date:   Tue May 20 11:00:02 2008 +0200

    [BUILD] Fix sparc #ifdef according to the new gcc tables
    
    Signed-off-by: Fabio M. Di Nitto <fdinitto at redhat.com>

-----------------------------------------------------------------------

Summary of changes:
 cman/qdisk/disk_util.c       |    2 +-
 rgmanager/include/platform.h |    2 +-
 rgmanager/src/clulib/vft.c   |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cman/qdisk/disk_util.c b/cman/qdisk/disk_util.c
index 040b978..a29a860 100644
--- a/cman/qdisk/disk_util.c
+++ b/cman/qdisk/disk_util.c
@@ -73,7 +73,7 @@ getuptime(struct timeval *tv)
 	if (!fp)
 		return -1;
 
-#if defined(__sparc__) || defined(__sparc64__)
+#if defined(__sparc__)
 	rv = fscanf(fp,"%ld.%d %ld.%d\n", &tv->tv_sec, &tv->tv_usec,
 		    &junk.tv_sec, &junk.tv_usec);
 #else
diff --git a/rgmanager/include/platform.h b/rgmanager/include/platform.h
index 7a49cc2..8f0ac48 100644
--- a/rgmanager/include/platform.h
+++ b/rgmanager/include/platform.h
@@ -67,7 +67,7 @@ Configure is gone...
 #define swab64(x) x=be_swap64(x)
 
 
-#ifdef __sparc64__
+#if defined(__sparc__)
 #define ALIGNED __attribute__((aligned))
 #define PACKED  __attribute__((aligned,packed))
 #else
diff --git a/rgmanager/src/clulib/vft.c b/rgmanager/src/clulib/vft.c
index 154bc98..6978cca 100644
--- a/rgmanager/src/clulib/vft.c
+++ b/rgmanager/src/clulib/vft.c
@@ -734,7 +734,7 @@ getuptime(struct timeval *tv)
 	if (!fp)
 		return -1;
 
-#if defined(__sparc__) || defined(__sparc64__)
+#if defined(__sparc__)
 	rv = fscanf(fp,"%ld.%d %ld.%d\n", &tv->tv_sec, &tv->tv_usec,
 		    &junk.tv_sec, &junk.tv_usec);
 #else


hooks/post-receive
--
Cluster Project