stable now but there are GIANT PIECES MISSING

[citadel.git] / citadel / modules / nntp / serv_nntp.c

diff --git a/citadel/modules/nntp/serv_nntp.c b/citadel/modules/nntp/serv_nntp.c
index ef923bb6298733202a43fcc818f47c619883c13b..20fc17e84e939567bc994ca063ae84d8209a6738 100644 (file)
--- a/citadel/modules/nntp/serv_nntp.c
+++ b/citadel/modules/nntp/serv_nntp.c
@@ -23,18 +23,7 @@
 #include <errno.h>
 #include <sys/types.h>
 #include <syslog.h>
-
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
-#endif
-
+#include <time.h>
 #include <sys/wait.h>
 #include <ctype.h>
 #include <string.h>
@@ -64,9 +53,6 @@
 
 extern long timezone;
 
-//     ***************** BEGIN UTILITY FUNCTIONS THAT COULD BE MOVED ELSEWHERE LATER **************
-
-
 //
 // Tests whether the supplied string is a valid newsgroup name
 // Returns true (nonzero) or false (0)
@@ -177,10 +163,6 @@ void newsgroup_to_room(char *target, char *source, size_t target_size) {
 }
 
 
-//     *****************  END  UTILITY FUNCTIONS THAT COULD BE MOVED ELSEWHERE LATER **************
-
-
-
 //
 // Here's where our NNTP session begins its happy day.
 //