[Pkg-wmaker-commits] [wmfsm] 61/83: wmgeneral: Use #includes from include-what-you-use.

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch master
in repository wmfsm.

commit fd35857a287f3485464e534c9dd99cc4bf54b018
Author: Doug Torrance <dtorrance at monmouthcollege.edu>
Date:   Tue May 19 22:30:52 2015 -0500

    wmgeneral: Use #includes from include-what-you-use.
---
 wmgeneral/wmgeneral.c | 20 +++++++++-----------
 wmgeneral/wmgeneral.h | 10 +++++++---
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/wmgeneral/wmgeneral.c b/wmgeneral/wmgeneral.c
index 0ca67c9..c74c9ee 100644
--- a/wmgeneral/wmgeneral.c
+++ b/wmgeneral/wmgeneral.c
@@ -40,18 +40,16 @@
 
 */
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <ctype.h>
-#include <stdarg.h>
-
-#include <X11/Xlib.h>
-#include <X11/xpm.h>
-#include <X11/extensions/shape.h>
-
 #include "wmgeneral.h"
+#include <X11/Xlib.h>                   /* for XCopyArea, etc */
+#include <X11/Xutil.h>                  /* for XSizeHints, XWMHints, etc */
+#include <X11/extensions/shape.h>       /* for XShapeCombineMask */
+#include <X11/extensions/shapeconst.h>  /* for ShapeBounding, ShapeSet */
+#include <X11/xpm.h>                    /* for XpmAttributes, Pixel, etc */
+#include <stddef.h>                     /* for size_t */
+#include <stdio.h>                      /* for fprintf, stderr, NULL, etc */
+#include <stdlib.h>                     /* for exit, free */
+#include <string.h>                     /* for strcmp, strdup, strcspn, etc */
 
   /*****************/
  /* X11 Variables */
diff --git a/wmgeneral/wmgeneral.h b/wmgeneral/wmgeneral.h
index e9d6ca6..1d68add 100644
--- a/wmgeneral/wmgeneral.h
+++ b/wmgeneral/wmgeneral.h
@@ -1,6 +1,10 @@
 #ifndef WMGENERAL_H_INCLUDED
 #define WMGENERAL_H_INCLUDED
 
+#include <X11/X.h>                      /* for Pixmap */
+#include <X11/Xlib.h>                   /* for Display */
+#include <X11/xpm.h>                    /* for XpmAttributes */
+
   /***********/
  /* Defines */
 /***********/
@@ -11,14 +15,12 @@
  /* Typedefs */
 /************/
 
-typedef struct _rckeys rckeys;
-
 struct _rckeys {
 	const char	*label;
 	char		**var;
 };
 
-typedef struct _rckeys2 rckeys2;
+typedef struct _rckeys rckeys;
 
 struct _rckeys2 {
 	const char	*family;
@@ -26,6 +28,8 @@ struct _rckeys2 {
 	char		**var;
 };
 
+typedef struct _rckeys2 rckeys2;
+
 typedef struct {
 	Pixmap			pixmap;
 	Pixmap			mask;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmfsm.git