---
wmSMPmon/wmgeneral/wmgeneral.c | 20 +++++++++-----------
wmSMPmon/wmgeneral/wmgeneral.h | 10 +++++++---
wmckgmail/wmgeneral/wmgeneral.c | 20 +++++++++-----------
wmckgmail/wmgeneral/wmgeneral.h | 10 +++++++---
wmcpufreq/wmgeneral/wmgeneral.c | 20 +++++++++-----------
wmcpufreq/wmgeneral/wmgeneral.h | 10 +++++++---
wmfsm/wmgeneral/wmgeneral.c | 20 +++++++++-----------
wmfsm/wmgeneral/wmgeneral.h | 10 +++++++---
wmifs/wmgeneral/wmgeneral.c | 20 +++++++++-----------
wmifs/wmgeneral/wmgeneral.h | 10 +++++++---
wmitime/wmgeneral/wmgeneral.c | 20 +++++++++-----------
wmitime/wmgeneral/wmgeneral.h | 10 +++++++---
wmkeys/wmgeneral/wmgeneral.c | 20 +++++++++-----------
wmkeys/wmgeneral/wmgeneral.h | 10 +++++++---
wmmon/wmgeneral/wmgeneral.c | 20 +++++++++-----------
wmmon/wmgeneral/wmgeneral.h | 10 +++++++---
wmppp.app/wmgeneral/wmgeneral.c | 20 +++++++++-----------
wmppp.app/wmgeneral/wmgeneral.h | 10 +++++++---
wmsm.app/wmgeneral/wmgeneral.c | 20 +++++++++-----------
wmsm.app/wmgeneral/wmgeneral.h | 10 +++++++---
wmtime/wmgeneral/wmgeneral.c | 20 +++++++++-----------
wmtime/wmgeneral/wmgeneral.h | 10 +++++++---
wmtz/wmgeneral/wmgeneral.c | 20 +++++++++-----------
wmtz/wmgeneral/wmgeneral.h | 10 +++++++---
24 files changed, 192 insertions(+), 168 deletions(-)
diff --git a/wmSMPmon/wmgeneral/wmgeneral.c b/wmSMPmon/wmgeneral/wmgeneral.c
index 0ca67c9..c74c9ee 100644
--- a/wmSMPmon/wmgeneral/wmgeneral.c
+++ b/wmSMPmon/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/wmSMPmon/wmgeneral/wmgeneral.h b/wmSMPmon/wmgeneral/wmgeneral.h
index e9d6ca6..1d68add 100644
--- a/wmSMPmon/wmgeneral/wmgeneral.h
+++ b/wmSMPmon/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;
diff --git a/wmckgmail/wmgeneral/wmgeneral.c b/wmckgmail/wmgeneral/wmgeneral.c
index 0ca67c9..c74c9ee 100644
--- a/wmckgmail/wmgeneral/wmgeneral.c
+++ b/wmckgmail/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/wmckgmail/wmgeneral/wmgeneral.h b/wmckgmail/wmgeneral/wmgeneral.h
index e9d6ca6..1d68add 100644
--- a/wmckgmail/wmgeneral/wmgeneral.h
+++ b/wmckgmail/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;
diff --git a/wmcpufreq/wmgeneral/wmgeneral.c b/wmcpufreq/wmgeneral/wmgeneral.c
index 0ca67c9..c74c9ee 100755
--- a/wmcpufreq/wmgeneral/wmgeneral.c
+++ b/wmcpufreq/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/wmcpufreq/wmgeneral/wmgeneral.h b/wmcpufreq/wmgeneral/wmgeneral.h
index e9d6ca6..1d68add 100755
--- a/wmcpufreq/wmgeneral/wmgeneral.h
+++ b/wmcpufreq/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;
diff --git a/wmfsm/wmgeneral/wmgeneral.c b/wmfsm/wmgeneral/wmgeneral.c
index 0ca67c9..c74c9ee 100644
--- a/wmfsm/wmgeneral/wmgeneral.c
+++ b/wmfsm/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/wmfsm/wmgeneral/wmgeneral.h b/wmfsm/wmgeneral/wmgeneral.h
index e9d6ca6..1d68add 100644
--- a/wmfsm/wmgeneral/wmgeneral.h
+++ b/wmfsm/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;
diff --git a/wmifs/wmgeneral/wmgeneral.c b/wmifs/wmgeneral/wmgeneral.c
index 0ca67c9..c74c9ee 100644
--- a/wmifs/wmgeneral/wmgeneral.c
+++ b/wmifs/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/wmifs/wmgeneral/wmgeneral.h b/wmifs/wmgeneral/wmgeneral.h
index e9d6ca6..1d68add 100644
--- a/wmifs/wmgeneral/wmgeneral.h
+++ b/wmifs/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;
diff --git a/wmitime/wmgeneral/wmgeneral.c b/wmitime/wmgeneral/wmgeneral.c
index 0ca67c9..c74c9ee 100644
--- a/wmitime/wmgeneral/wmgeneral.c
+++ b/wmitime/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/wmitime/wmgeneral/wmgeneral.h b/wmitime/wmgeneral/wmgeneral.h
index e9d6ca6..1d68add 100644
--- a/wmitime/wmgeneral/wmgeneral.h
+++ b/wmitime/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;
diff --git a/wmkeys/wmgeneral/wmgeneral.c b/wmkeys/wmgeneral/wmgeneral.c
index 0ca67c9..c74c9ee 100644
--- a/wmkeys/wmgeneral/wmgeneral.c
+++ b/wmkeys/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/wmkeys/wmgeneral/wmgeneral.h b/wmkeys/wmgeneral/wmgeneral.h
index e9d6ca6..1d68add 100644
--- a/wmkeys/wmgeneral/wmgeneral.h
+++ b/wmkeys/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;
diff --git a/wmmon/wmgeneral/wmgeneral.c b/wmmon/wmgeneral/wmgeneral.c
index 0ca67c9..c74c9ee 100644
--- a/wmmon/wmgeneral/wmgeneral.c
+++ b/wmmon/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/wmmon/wmgeneral/wmgeneral.h b/wmmon/wmgeneral/wmgeneral.h
index e9d6ca6..1d68add 100644
--- a/wmmon/wmgeneral/wmgeneral.h
+++ b/wmmon/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;
diff --git a/wmppp.app/wmgeneral/wmgeneral.c b/wmppp.app/wmgeneral/wmgeneral.c
index 0ca67c9..c74c9ee 100644
--- a/wmppp.app/wmgeneral/wmgeneral.c
+++ b/wmppp.app/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/wmppp.app/wmgeneral/wmgeneral.h b/wmppp.app/wmgeneral/wmgeneral.h
index e9d6ca6..1d68add 100644
--- a/wmppp.app/wmgeneral/wmgeneral.h
+++ b/wmppp.app/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;
diff --git a/wmsm.app/wmgeneral/wmgeneral.c b/wmsm.app/wmgeneral/wmgeneral.c
index 0ca67c9..c74c9ee 100644
--- a/wmsm.app/wmgeneral/wmgeneral.c
+++ b/wmsm.app/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/wmsm.app/wmgeneral/wmgeneral.h b/wmsm.app/wmgeneral/wmgeneral.h
index e9d6ca6..1d68add 100644
--- a/wmsm.app/wmgeneral/wmgeneral.h
+++ b/wmsm.app/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;
diff --git a/wmtime/wmgeneral/wmgeneral.c b/wmtime/wmgeneral/wmgeneral.c
index 0ca67c9..c74c9ee 100644
--- a/wmtime/wmgeneral/wmgeneral.c
+++ b/wmtime/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/wmtime/wmgeneral/wmgeneral.h b/wmtime/wmgeneral/wmgeneral.h
index e9d6ca6..1d68add 100644
--- a/wmtime/wmgeneral/wmgeneral.h
+++ b/wmtime/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;
diff --git a/wmtz/wmgeneral/wmgeneral.c b/wmtz/wmgeneral/wmgeneral.c
index 0ca67c9..c74c9ee 100644
--- a/wmtz/wmgeneral/wmgeneral.c
+++ b/wmtz/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/wmtz/wmgeneral/wmgeneral.h b/wmtz/wmgeneral/wmgeneral.h
index e9d6ca6..1d68add 100644
--- a/wmtz/wmgeneral/wmgeneral.h
+++ b/wmtz/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;
--
2.1.4
--
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.
