* [Cluster-devel] cluster/cman/qdisk disk_util.c
@ 2007-01-26 14:34 lhh
0 siblings, 0 replies; 3+ messages in thread
From: lhh @ 2007-01-26 14:34 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: cluster
Branch: RHEL4
Changes by: lhh at sourceware.org 2007-01-26 14:34:26
Modified files:
cman/qdisk : disk_util.c
Log message:
Patch from Fabio Massimo Di Nitto - Fix portability of getuptime function
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/qdisk/disk_util.c.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.1.2.2&r2=1.1.2.3
--- cluster/cman/qdisk/disk_util.c 2007/01/23 17:57:07 1.1.2.2
+++ cluster/cman/qdisk/disk_util.c 2007/01/26 14:34:26 1.1.2.3
@@ -71,8 +71,13 @@
if (!fp)
return -1;
+#if defined(__sparc__) || defined(__hppa__) || defined(__sparc64__) || defined (__hppa64__)
+ rv = fscanf(fp,"%ld.%d %ld.%d\n", &tv->tv_sec, &tv->tv_usec,
+ &junk.tv_sec, &junk.tv_usec);
+#else
rv = fscanf(fp,"%ld.%ld %ld.%ld\n", &tv->tv_sec, &tv->tv_usec,
&junk.tv_sec, &junk.tv_usec);
+#endif
fclose(fp);
if (rv != 4) {
^ permalink raw reply [flat|nested] 3+ messages in thread* [Cluster-devel] cluster/cman/qdisk disk_util.c
@ 2007-01-26 14:34 lhh
0 siblings, 0 replies; 3+ messages in thread
From: lhh @ 2007-01-26 14:34 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: cluster
Branch: RHEL5
Changes by: lhh at sourceware.org 2007-01-26 14:34:55
Modified files:
cman/qdisk : disk_util.c
Log message:
Patch from Fabio Massimo Di Nitto - Fix portability of getuptime function
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/qdisk/disk_util.c.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.2.4.1&r2=1.2.4.2
--- cluster/cman/qdisk/disk_util.c 2007/01/23 17:56:14 1.2.4.1
+++ cluster/cman/qdisk/disk_util.c 2007/01/26 14:34:55 1.2.4.2
@@ -71,8 +71,13 @@
if (!fp)
return -1;
+#if defined(__sparc__) || defined(__hppa__) || defined(__sparc64__) || defined (__hppa64__)
+ rv = fscanf(fp,"%ld.%d %ld.%d\n", &tv->tv_sec, &tv->tv_usec,
+ &junk.tv_sec, &junk.tv_usec);
+#else
rv = fscanf(fp,"%ld.%ld %ld.%ld\n", &tv->tv_sec, &tv->tv_usec,
&junk.tv_sec, &junk.tv_usec);
+#endif
fclose(fp);
if (rv != 4) {
^ permalink raw reply [flat|nested] 3+ messages in thread* [Cluster-devel] cluster/cman/qdisk disk_util.c
@ 2007-01-26 14:35 lhh
0 siblings, 0 replies; 3+ messages in thread
From: lhh @ 2007-01-26 14:35 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: cluster
Changes by: lhh at sourceware.org 2007-01-26 14:35:13
Modified files:
cman/qdisk : disk_util.c
Log message:
Patch from Fabio Massimo Di Nitto - Fix portability of getuptime function
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/qdisk/disk_util.c.diff?cvsroot=cluster&r1=1.3&r2=1.4
--- cluster/cman/qdisk/disk_util.c 2007/01/23 17:57:26 1.3
+++ cluster/cman/qdisk/disk_util.c 2007/01/26 14:35:13 1.4
@@ -71,8 +71,13 @@
if (!fp)
return -1;
+#if defined(__sparc__) || defined(__hppa__) || defined(__sparc64__) || defined (__hppa64__)
+ rv = fscanf(fp,"%ld.%d %ld.%d\n", &tv->tv_sec, &tv->tv_usec,
+ &junk.tv_sec, &junk.tv_usec);
+#else
rv = fscanf(fp,"%ld.%ld %ld.%ld\n", &tv->tv_sec, &tv->tv_usec,
&junk.tv_sec, &junk.tv_usec);
+#endif
fclose(fp);
if (rv != 4) {
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2007-01-26 14:35 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-01-26 14:34 [Cluster-devel] cluster/cman/qdisk disk_util.c lhh
-- strict thread matches above, loose matches on Subject: below --
2007-01-26 14:34 lhh
2007-01-26 14:35 lhh
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).