From 09d82e2621017aca1ae107d0dc9d57a7820f56b1 Mon Sep 17 00:00:00 2001 From: Nathan Bryant Date: Tue, 11 Dec 2001 20:04:41 +0000 Subject: [PATCH] - fix library flags, includes for portability - malloc.h is deprecated - fix genstamp, hopefully - fix size_t *printf handling for portability --- citadel/ChangeLog | 7 ++++++- citadel/Makefile.in | 6 +++--- citadel/citadel.h | 1 + citadel/file_ops.c | 2 +- citadel/genstamp.c | 2 +- citadel/room_ops.c | 2 +- citadel/server_main.c | 3 --- citadel/sysdep.c | 3 --- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/citadel/ChangeLog b/citadel/ChangeLog index 4dc5d6c5b..72602733e 100644 --- a/citadel/ChangeLog +++ b/citadel/ChangeLog @@ -1,4 +1,10 @@ $Log$ + Revision 590.1 2001/12/11 20:04:41 nbryant + - fix library flags, includes for portability + - malloc.h is deprecated + - fix genstamp, hopefully + - fix size_t *printf handling for portability + Revision 590.0 2001/12/08 03:31:41 ajc * THIS IS 5.90 @@ -2939,4 +2945,3 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant Fri Jul 10 1998 Art Cancro * Initial CVS import - diff --git a/citadel/Makefile.in b/citadel/Makefile.in index fb1eb45ba..d80c7d447 100644 --- a/citadel/Makefile.in +++ b/citadel/Makefile.in @@ -201,7 +201,7 @@ modules/libimap.la: serv_imap.lo imap_tools.lo imap_fetch.lo \ ../imap_fetch.lo ../imap_search.lo ../imap_store.lo ../imap_misc.lo ../libcitserver.la aidepost: aidepost.o libcitserver.la $(LIBOBJS) - $(LIBTOOL) $(CC) aidepost.o libcitserver.la $(LIBOBJS) $(LDFLAGS) -o aidepost + $(LIBTOOL) $(CC) aidepost.o libcitserver.la $(LIBOBJS) $(LDFLAGS) -o aidepost $(PTHREAD_LIBS) modules/libpas2.la: serv_pas2.lo md5.lo $(LIBTOOL) libcitserver.la $(LTSHARE) -o libpas2.la ../serv_pas2.lo ../md5.lo ../libcitserver.la @@ -229,7 +229,7 @@ migratenet$(EXEEXT): migratenet.o config.o ipc_c_tcp.o tools.o $(LIBOBJS) sendcommand: sendcommand.o ipc_c_tcp.o libcitserver.la $(LIBOBJS) $(LIBTOOL) $(CC) sendcommand.o ipc_c_tcp.o libcitserver.la \ - $(LIBOBJS) $(LDFLAGS) -o sendcommand $(NETLIBS) + $(LIBOBJS) $(LDFLAGS) -o sendcommand $(NETLIBS) $(PTHREAD_LIBS) base64: base64.o $(CC) base64.o $(LDFLAGS) -o base64 @@ -245,7 +245,7 @@ readlog: readlog.o config.o $(CC) readlog.o config.o $(LDFLAGS) -o readlog stats: stats.o ipc_c_tcp.o libcitserver.la $(LIBOBJS) - $(LIBTOOL) $(CC) stats.o ipc_c_tcp.o libcitserver.la $(LIBOBJS) $(LDFLAGS) -o stats $(NETLIBS) + $(LIBTOOL) $(CC) stats.o ipc_c_tcp.o libcitserver.la $(LIBOBJS) $(LDFLAGS) -o stats $(NETLIBS) $(PTHREAD_LIBS) .PHONY: install-data install-doc install-exec clean cleaner distclean diff --git a/citadel/citadel.h b/citadel/citadel.h index b0a94100c..8b1e08602 100644 --- a/citadel/citadel.h +++ b/citadel/citadel.h @@ -11,6 +11,7 @@ #define CITADEL_H #include "sysdep.h" +#include #include "sysconfig.h" #include "ipcdef.h" diff --git a/citadel/file_ops.c b/citadel/file_ops.c index ea998fca2..1d1e8705d 100644 --- a/citadel/file_ops.c +++ b/citadel/file_ops.c @@ -780,7 +780,7 @@ void cmd_ndop(char *cmdbuf) CC->dl_is_net = 1; stat(pathname, &statbuf); - cprintf("%d %ld\n", OK, statbuf.st_size); + cprintf("%d %ld\n", OK, (long)statbuf.st_size); } /* diff --git a/citadel/genstamp.c b/citadel/genstamp.c index ce9575559..8915afa88 100644 --- a/citadel/genstamp.c +++ b/citadel/genstamp.c @@ -51,7 +51,7 @@ void datestring(char *buf, time_t xtime, int which_format) { t = localtime(&xtime); /* Convert "seconds west of GMT" to "hours/minutes offset" */ - offset = timezone; + offset = t->tm_gmtoff; if (offset > 0) { offsign = '-'; } diff --git a/citadel/room_ops.c b/citadel/room_ops.c index 4bab8b8d0..228b22bab 100644 --- a/citadel/room_ops.c +++ b/citadel/room_ops.c @@ -925,7 +925,7 @@ void cmd_rdir(void) &buf[strlen(flnm) + 1], sizeof comment); } - cprintf("%s|%ld|%s\n", flnm, statbuf.st_size, comment); + cprintf("%s|%ld|%s\n", flnm, (long)statbuf.st_size, comment); } } fclose(ls); diff --git a/citadel/server_main.c b/citadel/server_main.c index b021b8991..9cf80d5f5 100644 --- a/citadel/server_main.c +++ b/citadel/server_main.c @@ -37,9 +37,6 @@ #include #include #include -#ifdef __GNUC__ -#include -#endif #ifdef HAVE_PTHREAD_H #include #endif diff --git a/citadel/sysdep.c b/citadel/sysdep.c index 80427374c..6a565b0a4 100644 --- a/citadel/sysdep.c +++ b/citadel/sysdep.c @@ -49,9 +49,6 @@ #include #include #include -#ifdef __GNUC__ -#include -#endif #ifdef HAVE_PTHREAD_H #include #endif -- 2.30.2