From 1643809b4326d7d789c714dada1884c82cd8d191 Mon Sep 17 00:00:00 2001
From: Art Cancro <ajc@citadel.org>
Date: Wed, 24 Mar 2004 03:46:41 +0000
Subject: [PATCH] * Reorg header stuff to make it more compatible with leak
 checkers

---
 citadel/ChangeLog       | 4 +++-
 citadel/citadel.h       | 1 -
 citadel/ical_dezonify.c | 1 +
 citadel/routines2.c     | 2 +-
 citadel/screen.c        | 5 +++--
 citadel/serv_calendar.c | 1 +
 6 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index abaaf88b3..71fb91cdd 100644
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,7 @@
  $Log$
+ Revision 614.97  2004/03/24 03:46:40  ajc
+ * Reorg header stuff to make it more compatible with leak checkers
+
  Revision 614.96  2004/03/24 03:25:19  ajc
  * Removed the built-in memory leak checker.  It wasn't threadsafe and
    there now exist third-party utilities that do this job better.
@@ -5594,4 +5597,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/citadel.h b/citadel/citadel.h
index 71f000266..01aaf3924 100644
--- a/citadel/citadel.h
+++ b/citadel/citadel.h
@@ -324,5 +324,4 @@ enum {
 }
 #endif
 
-
 #endif /* CITADEL_H */
diff --git a/citadel/ical_dezonify.c b/citadel/ical_dezonify.c
index 6055cc0d8..ccc46d431 100644
--- a/citadel/ical_dezonify.c
+++ b/citadel/ical_dezonify.c
@@ -9,6 +9,7 @@
 
 
 #include "sysdep.h"
+#include <stdlib.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <limits.h>
diff --git a/citadel/routines2.c b/citadel/routines2.c
index b5ee17f19..66ff6d090 100644
--- a/citadel/routines2.c
+++ b/citadel/routines2.c
@@ -5,7 +5,6 @@
  *
  */
 
-#include "sysdep.h"
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/types.h>
@@ -31,6 +30,7 @@
 #include <pwd.h>
 #include <errno.h>
 #include <stdarg.h>
+#include "sysdep.h"
 #include "citadel.h"
 #include "citadel_ipc.h"
 #include "citadel_decls.h"
diff --git a/citadel/screen.c b/citadel/screen.c
index 2acfcd2d1..70ee4003e 100644
--- a/citadel/screen.c
+++ b/citadel/screen.c
@@ -4,13 +4,14 @@
  * Handle full-screen curses stuff
  */
 
-#include "sysdep.h"
+#include <stdlib.h>
+#include <unistd.h>
 #include <stdio.h>
 #include <signal.h>
 #include <string.h>
 #include <stdarg.h>
-#include <unistd.h>
 #include <sys/types.h>
+#include "sysdep.h"
 #ifdef HAVE_VW_PRINTW
 #define _vwprintw vw_printw
 #else
diff --git a/citadel/serv_calendar.c b/citadel/serv_calendar.c
index 1b0d4876a..6445c2818 100644
--- a/citadel/serv_calendar.c
+++ b/citadel/serv_calendar.c
@@ -10,6 +10,7 @@
 #define PRODID "-//Citadel//NONSGML Citadel Calendar//EN"
 
 #include "sysdep.h"
+#include <stdlib.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <limits.h>
-- 
2.30.2