edox: Header file cleanups.

SVN revision: 45716
2010-01-29 19:44:58 +00:00 · 2010-01-29 19:44:58 +00:00 · 88b900c0ef
parent 89dc057e9a
commit 88b900c0ef
6 changed files with 37 additions and 43 deletions
--- a/dox/dox.c
+++ b/dox/dox.c
@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
- * Copyright (C) 2007-2008 Kim Woelders
+ * Copyright (C) 2007-2010 Kim Woelders
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@ -21,22 +21,23 @@
 * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
-#include "dox.h"
-
+#include "config.h"
+#ifdef HAVE_LOCALE_H
+#include <locale.h>
+#endif
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 #include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/Xosdefs.h>
 #include <X11/Xproto.h>
-#include <X11/keysym.h>
+#include <X11/Xutil.h>
 #include <X11/Xatom.h>
-
 #ifdef USE_XINERAMA
 #include <X11/extensions/Xinerama.h>
 #endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
+#include <X11/keysym.h>
+#include "dox.h"

 #define EDOX_DEFAULT_W  512
 #define EDOX_DEFAULT_H  400
--- a/dox/dox.h
+++ b/dox/dox.h
@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
- * Copyright (C) 2007-2008 Kim Woelders
+ * Copyright (C) 2007-2010 Kim Woelders
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@ -21,35 +21,9 @@
 * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
-#include "config.h"
-
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/Xproto.h>
-#include <X11/Xlocale.h>
-#include <X11/cursorfont.h>
-#include <X11/extensions/shape.h>
-#include <X11/extensions/XShm.h>
 #include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdarg.h>
-#include <string.h>
-#include <fcntl.h>
-#include <dirent.h>
-#include <signal.h>
-#include <time.h>
-#include <math.h>
-#include <pwd.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/stat.h>
-#include <sys/resource.h>
-#include <sys/ipc.h>
-#include <sys/shm.h>
-
 #include <Imlib2.h>
+#include <X11/Xlib.h>

 #define EAllocColor(pxc) \
 	XAllocColor(disp, VRoot.cmap, pxc)
--- a/dox/file.c
+++ b/dox/file.c
@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
- * Copyright (C) 2008 Kim Woelders
+ * Copyright (C) 2008-2010 Kim Woelders
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@ -21,10 +21,16 @@
 * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
-#include "dox.h"
+#include "config.h"
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
 #ifdef USE_WORD_MB
 # include <wctype.h>
 #endif
+#include "dox.h"

 int
 exists(char *s)
@ -111,6 +117,7 @@ word(char *s, int num, char *wd)
 }

 #ifdef USE_WORD_MB
+#error
 void
 word_mb(char *s, int num, char *wd, int *spaceflag)
 {
@ -264,6 +271,9 @@ word_mb(char *s, int num, char *wd, int *spaceflag)
 }
 #endif

+#ifdef HAVE_LOCALE_H
+#include <locale.h>
+#endif
 int
 findLocalizedFile(char *fname)
 {
--- a/dox/format.c
+++ b/dox/format.c
@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
- * Copyright (C) 2007-2008 Kim Woelders
+ * Copyright (C) 2007-2010 Kim Woelders
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@ -21,6 +21,9 @@
 * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
+#include "config.h"
+#include <stdlib.h>
+#include <string.h>
 #include "dox.h"

 #define DEFAULT_LINKCOLOR_R 30
--- a/dox/text.c
+++ b/dox/text.c
@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
- * Copyright (C) 2007-2008 Kim Woelders
+ * Copyright (C) 2007-2010 Kim Woelders
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@ -21,6 +21,9 @@
 * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
+#include "config.h"
+#include <stdlib.h>
+#include <string.h>
 #include "dox.h"

 static char       **
--- a/dox/ttfont.c
+++ b/dox/ttfont.c
@ -1,5 +1,6 @@
 /*
 * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
+ * Copyright (C) 2010 Kim Woelders
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@ -20,6 +21,8 @@
 * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
+#include "config.h"
+#include <stdlib.h>
 #include "dox.h"

 struct _efont {