* configure.in: another OpenBSD fix. now it actually works.

        * serv_chat.c: warning fix

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 06293f5f0a15b685a70fa315f23d4243058017cf..111da42d4ef8969fd5f2646995caa56148e0304f 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,3 +1,7 @@
+1999-04-11 Nathan Bryant <bryant@cs.usm.maine.edu>
+       * configure.in: another OpenBSD fix. now it actually works.
+       * serv_chat.c: warning fix
+
 Thu Apr  8 22:51:28 EDT 1999 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
        * config.c: now requires a setup run for *any* rev level difference
        * Updated docs & confs for 5.53b1 release

diff --git a/citadel/configure.in b/citadel/configure.in
index dd103c27d709a7ace3a18724c7ae31c9e324fc15..7da590a853eda2a7aaaa7b53324e50cd42c429cc 100644 (file)
--- a/citadel/configure.in
+++ b/citadel/configure.in
@@ -149,7 +149,14 @@ AC_HEADER_DIRENT
 AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
 test -f /usr/local/include/gdbm.h && CPPFLAGS="$CPPFLAGS -I/usr/local/include"
-AC_CHECK_HEADERS(curses.h fcntl.h limits.h termios.h strings.h sys/ioctl.h sys/select.h sys/time.h syslog.h unistd.h pthread.h gdbm.h utmp.h)
+AC_CHECK_HEADERS(curses.h fcntl.h limits.h termios.h strings.h sys/ioctl.h sys/select.h sys/time.h syslog.h unistd.h gdbm.h utmp.h)
+
+dnl some systems require -pthread, -D_REENTRANT, etc to be passed to cc if we
+dnl include pthread.h:
+save_CPPFLAGS=$CPPFLAGS
+CPPFLAGS="$CPPFLAGS $PTHREAD_DEFS"
+AC_CHECK_HEADERS(pthread.h)
+CPPFLAGS=$save_CPPFLAGS
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST

diff --git a/citadel/serv_chat.c b/citadel/serv_chat.c
index 000cc7ade7d49e6561528513d9303829920e9ae4..b2c5995facb280608ca4f50119d9d91c728bdee4 100644 (file)
--- a/citadel/serv_chat.c
+++ b/citadel/serv_chat.c
@@ -497,7 +497,7 @@ int send_express_message(char *lun, char *x_user, char *x_msg)
                fp = fopen(CC->temp, "wb");
                fprintf(fp, "%c%c%c", 255, MES_NORMAL, 0);
                fprintf(fp, "Psysop%c", 0);
-               fprintf(fp, "T%ld%c", time(NULL), 0);
+               fprintf(fp, "T%ld%c", (long)time(NULL), 0);
                fprintf(fp, "A%s%c", lun, 0);
                fprintf(fp, "R%s%c", x_user, 0);
                fprintf(fp, "O%s%c", config.c_logpages, 0);