The attached patch is an updated version with a better fix for the
'static declaration follows non-static declaration' bug.
Regards
Andreas Jochens
diff -urN ../tmp-orig/kimberlite-1.1.0/include/logger.h ./include/logger.h
--- ../tmp-orig/kimberlite-1.1.0/include/logger.h 2001-03-29
07:22:28.000000000 +0200
+++ ./include/logger.h 2005-03-20 12:08:57.652775689 +0100
@@ -47,7 +47,6 @@
* This has to be set by the process using the logging library. The
* default it LOG_WARNING, as dictated by LOGLEVEL_DFLT.
*/
-extern int loglevel;
struct log_msg {
generic_msg_hdr hdr;
diff -urN ../tmp-orig/kimberlite-1.1.0/src/cluadmin/Makefile.am
./src/cluadmin/Makefile.am
--- ../tmp-orig/kimberlite-1.1.0/src/cluadmin/Makefile.am 2001-03-29
07:22:28.000000000 +0200
+++ ./src/cluadmin/Makefile.am 2005-03-20 12:09:43.217951506 +0100
@@ -89,7 +89,7 @@
gcc ${CFLAGS} -c [EMAIL PROTECTED]@/include cluster_wrap.c
cluster_wrap.c: cluster.i
- swig -make_default -Sskip 0 -tcl8 -dascii -module Cluster -namespace
cluster.i
+ swig -make_default -tcl8 -dascii -module Cluster -namespace cluster.i
getline.o: getline.c
gcc ${CFLAGS} -c getline.c
diff -urN ../tmp-orig/kimberlite-1.1.0/src/clulib/parseconf.c
./src/clulib/parseconf.c
--- ../tmp-orig/kimberlite-1.1.0/src/clulib/parseconf.c 2001-03-29
07:22:28.000000000 +0200
+++ ./src/clulib/parseconf.c 2005-03-20 12:09:43.218951313 +0100
@@ -561,7 +561,7 @@
static ulong get_checksum(void) {
ulong checksum = 0L;
if (initAlignedBufStuff() < 0) {
- fprintf(stderr, __FUNCTION__ ": Unable to init rawio support.\n");
+ fprintf(stderr, "%1: Unable to init rawio support.\n", __func__);
return(-1);
}
@@ -1195,7 +1195,7 @@
ssize_t written;
char timestamp_buffer[BUFFER_SIZE];
if (initAlignedBufStuff() < 0) {
- fprintf(stderr, __FUNCTION__ ": Unable to init rawio support.\n");
+ fprintf(stderr, "%1: Unable to init rawio support.\n", __func__);
return(-1);
}
@@ -1263,7 +1263,7 @@
CFG_status result=CFG_OK;
if (initAlignedBufStuff() < 0) {
- fprintf(stderr, __FUNCTION__ ": Unable to init rawio support.\n");
+ fprintf(stderr, "%1: Unable to init rawio support.\n", __func__);
return(-1);
}
diff -urN ../tmp-orig/kimberlite-1.1.0/src/utils/clu_config.c
./src/utils/clu_config.c
--- ../tmp-orig/kimberlite-1.1.0/src/utils/clu_config.c 2001-03-29
07:22:28.000000000 +0200
+++ ./src/utils/clu_config.c 2005-03-20 12:09:43.219951119 +0100
@@ -165,8 +165,7 @@
ssize_t res;
if (initAlignedBufStuff() < 0) {
- fprintf(stderr, __FUNCTION__
- ": Unable to init rawio support.\n");
+ fprintf(stderr, "%1: Unable to init rawio support.\n", __func__);
return(CFG_FAILED);
}
length = BUFFER_SIZE;
diff -urN ../tmp-orig/kimberlite-1.1.0/src/utils/invalidatebuffers.c
./src/utils/invalidatebuffers.c
--- ../tmp-orig/kimberlite-1.1.0/src/utils/invalidatebuffers.c 2005-03-20
12:16:34.716269465 +0100
+++ ./src/utils/invalidatebuffers.c 2005-03-20 12:09:43.219951119 +0100
@@ -46,16 +46,12 @@
#include <sys/types.h>
#include <sys/ioctl.h>
#include <stdlib.h>
+#include <errno.h>
/*
* Cluster includes
*/
#include <logger.h>
-/*
- * External declarations
- */
-extern int errno;
-
/***************************************************************************
*
* Functions
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
