removed last vestiges of "#ifdef CIT_CLIENT" conditional compilation,

which has been rendered unusable by the build system simplifications

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index ef0a10e405514e456e13c762b4aa5ee7fdde6728..0032b978e0feecdb5baef3432592841fbae804cf 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,8 @@
  $Log$
+ Revision 590.165  2002/03/26 05:20:46  nbryant
+ removed last vestiges of "#ifdef CIT_CLIENT" conditional compilation,
+ which has been rendered unusable by the build system simplifications
+
  Revision 590.164  2002/03/26 05:13:32  nbryant
  fix monstrous shell script syntax in configure.ac
 
@@ -3552,4 +3556,3 @@ 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/Makefile.in b/citadel/Makefile.in
index 0d1914b73c67bb7e87e217776f7f68a2a9854142..826127ee7f769be40170338802b21d44fbb69616 100644 (file)
--- a/citadel/Makefile.in
+++ b/citadel/Makefile.in
@@ -140,7 +140,7 @@ citserver: $(SERV_OBJS) $(LIBTOOL) libcitserver.la
        citserver $(LIBS)
 
 .c.o:
-       $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) -DCIT_CLIENT -c $< -o $@
+       $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) -c $< -o $@
 
 .c.lo: $(LIBTOOL)
        @test -d modules || mkdir -p modules

diff --git a/citadel/ipc_c_tcp.c b/citadel/ipc_c_tcp.c
index c47c7f4df840cfc3ba3d9cdca8677e6d2da483e7..1680bcbf51eca57d4703fe30672aaa1e27e09a20 100644 (file)
--- a/citadel/ipc_c_tcp.c
+++ b/citadel/ipc_c_tcp.c
@@ -177,7 +177,7 @@ void serv_read(char *buf, int bytes)
 {
        int len, rlen;
 
-#if defined(HAVE_OPENSSL) && defined(CIT_CLIENT)
+#if defined(HAVE_OPENSSL)
        if (ssl_is_connected) {
                serv_read_ssl(buf, bytes);
                return;
@@ -203,7 +203,7 @@ void serv_write(char *buf, int nbytes)
        int bytes_written = 0;
        int retval;
 
-#if defined(HAVE_OPENSSL) && defined(CIT_CLIENT)
+#if defined(HAVE_OPENSSL)
        if (ssl_is_connected) {
                serv_write_ssl(buf, nbytes);
                return;