- configury tweaks for a /usr/include/db3 goof and Digital/Tru64 Unix

- #ifdef out inline on non-GCC compilers

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 2d494e41d16718b0b764ecd5ceac3c5602135cba..b545abbf125530ace4159d16f5cd4c8f1a092138 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,8 @@
  $Log$
+ Revision 580.58  2001/10/16 01:48:55  nbryant
+ - configury tweaks for a /usr/include/db3 goof and Digital/Tru64 Unix
+ - #ifdef out inline on non-GCC compilers
+
  Revision 580.57  2001/10/15 19:50:50  ajc
  * Fixed a bug in the loopzapper that was corrupting the use table saved copy.
  * Post notification in Aide> when the loopzapper catches a message.
@@ -2795,3 +2799,4 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import 
+

diff --git a/citadel/configure.ac b/citadel/configure.ac
index fd622c3ceeabb81c82c94f89db907eeca618e21b..41b853d20ebb28fb39b8ab6d806cafcc5179a861 100644 (file)
--- a/citadel/configure.ac
+++ b/citadel/configure.ac
@@ -63,11 +63,10 @@ case "$host" in
        dnl build pthreads programs with gcc due to header problems.
        alpha*-dec-osf*)
                test -z "$CC" && CC=cc
-               PTHREAD_DEFS=-pthread
-               PTHREAD_LIBS=-pthread
+               PTHREAD_LIBS="-lpthread -lexc"
                check_pthread=no
        ;;
-       dnl FreeBSD is similar to Digital UNIX:
+       dnl FreeBSD is similar to Digital UNIX with DEC C, which has a -pthread flag:
        *-*-freebsd*)
                if test "$with_kthread" = yes; then
                        PTHREAD_LIBS=-kthread
@@ -218,7 +217,7 @@ dnl Checks for header files.
 AC_HEADER_DIRENT
 AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
-test "$db_dir" && CPPFLAGS="$CPPFLAGS -I$db_dir/include" || test -d /usr/include/db3 && CPPFLAGS="$CPPFLAGS -I/usr/include/db3"
+test "$db_dir" && CPPFLAGS="$CPPFLAGS -I$db_dir/include" || ( test -d /usr/include/db3 && CPPFLAGS="$CPPFLAGS -I/usr/include/db3" )
 AC_CHECK_HEADERS(curses.h dl.h fcntl.h limits.h termios.h sys/ioctl.h sys/select.h sys/time.h syslog.h unistd.h utmp.h utmpx.h paths.h)
 
 AC_CHECK_HEADER(resolv.h, [SMTP=modules/libsmtp.la; DOMAIN=domain.c])

diff --git a/citadel/server.h b/citadel/server.h
index c30b95254fd9981946905f28ffb738a337438fa4..f31ed063cc41b41aaa1c220e4a9ba524187f1c1a 100644 (file)
--- a/citadel/server.h
+++ b/citadel/server.h
@@ -12,6 +12,12 @@
 #ifndef SERVER_H
 #define SERVER_H
 
+#ifdef __GNUC__
+#define INLINE inline
+#else
+#define INLINE
+#endif
+
 #ifdef __CYGWIN__
 
 #ifdef IN_LIBCIT

diff --git a/citadel/sysdep.c b/citadel/sysdep.c
index 6a77222914922bcae144fe55bdf4657dc5706fdb..f1c933f8e5dc6987dc605b177e3a1597a19d8c7e 100644 (file)
--- a/citadel/sysdep.c
+++ b/citadel/sysdep.c
@@ -939,7 +939,7 @@ void init_master_fdset(void) {
 /*
  * Bind a thread to a context.  (It's inline merely to speed things up.)
  */
-inline void become_session(struct CitContext *which_con) {
+INLINE void become_session(struct CitContext *which_con) {
        pthread_setspecific(MyConKey, (void *)which_con );
 }
 

diff --git a/citadel/sysdep_decls.h b/citadel/sysdep_decls.h
index f5c0febc5a12ecf43f53bd81460516ce1c0cdd15..fc977fe04fcf5240e2f8e0d0298c905f8ecf2a62 100644 (file)
--- a/citadel/sysdep_decls.h
+++ b/citadel/sysdep_decls.h
@@ -25,7 +25,7 @@ void start_daemon (int do_close_stdio);
 void cmd_nset (char *cmdbuf);
 int convert_login (char *NameToConvert);
 void *worker_thread (void *arg);
-inline void become_session(struct CitContext *which_con);
+void become_session(struct CitContext *which_con);
 void CtdlRedirectOutput(FILE *fp, int sock);
 void InitializeMasterCC(void);
 void init_master_fdset(void);