From 78f4db51403f38590d1424444506e71f71212088 Mon Sep 17 00:00:00 2001
From: okan <okan@openbsd.org>
Date: Thu, 3 Oct 2013 13:51:57 +0000
Subject: [PATCH] unify type; no change

---
 app/cwm/calmwm.h | 4 ++--
 app/cwm/client.c | 4 ++--
 app/cwm/group.c  | 4 ++--
 app/cwm/xutil.c  | 8 ++++----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/cwm/calmwm.h b/app/cwm/calmwm.h
index a544fe018..8c41c7098 100644
--- a/app/cwm/calmwm.h
+++ b/app/cwm/calmwm.h
@@ -15,7 +15,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $OpenBSD: calmwm.h,v 1.220 2013/07/16 14:04:44 okan Exp $
+ * $OpenBSD: calmwm.h,v 1.221 2013/10/03 13:51:57 okan Exp $
  */
 
 #ifndef _CALMWM_H_
@@ -512,7 +512,7 @@ void			 xev_loop(void);
 
 void			 xu_btn_grab(Window, int, u_int);
 void			 xu_btn_ungrab(Window, int, u_int);
-int			 xu_getprop(Window, Atom, Atom, long, u_char **);
+int			 xu_getprop(Window, Atom, Atom, long, unsigned char **);
 int			 xu_get_wm_state(Window, int *);
 int			 xu_getstrprop(Window, Atom, char **);
 void			 xu_key_grab(Window, u_int, KeySym);
diff --git a/app/cwm/client.c b/app/cwm/client.c
index 521601a5e..912adc456 100644
--- a/app/cwm/client.c
+++ b/app/cwm/client.c
@@ -15,7 +15,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $OpenBSD: client.c,v 1.136 2013/07/15 23:51:59 okan Exp $
+ * $OpenBSD: client.c,v 1.137 2013/10/03 13:51:59 okan Exp $
  */
 
 #include <sys/param.h>
@@ -841,7 +841,7 @@ client_getmwmhints(struct client_ctx *cc)
 	struct mwm_hints	*mwmh;
 
 	if (xu_getprop(cc->win, cwmh[_MOTIF_WM_HINTS], cwmh[_MOTIF_WM_HINTS],
-	    PROP_MWM_HINTS_ELEMENTS, (u_char **)&mwmh) == MWM_NUMHINTS)
+	    PROP_MWM_HINTS_ELEMENTS, (unsigned char **)&mwmh) == MWM_NUMHINTS)
 		if (mwmh->flags & MWM_HINTS_DECORATIONS &&
 		    !(mwmh->decorations & MWM_DECOR_ALL) &&
 		    !(mwmh->decorations & MWM_DECOR_BORDER))
diff --git a/app/cwm/group.c b/app/cwm/group.c
index fea05ff92..51e2a3400 100644
--- a/app/cwm/group.c
+++ b/app/cwm/group.c
@@ -16,7 +16,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $OpenBSD: group.c,v 1.79 2013/07/15 14:50:44 okan Exp $
+ * $OpenBSD: group.c,v 1.80 2013/10/03 13:51:59 okan Exp $
  */
 
 #include <sys/param.h>
@@ -419,7 +419,7 @@ group_update_names(struct screen_ctx *sc)
 	int		 i = 0, j = 0, nstrings = 0, n = 0, setnames = 0;
 
 	if ((j = xu_getprop(sc->rootwin, ewmh[_NET_DESKTOP_NAMES],
-	    cwmh[UTF8_STRING], 0xffffff, (u_char **)&prop_ret)) > 0) {
+	    cwmh[UTF8_STRING], 0xffffff, (unsigned char **)&prop_ret)) > 0) {
 		prop_ret[j - 1] = '\0'; /* paranoia */
 		while (i < j) {
 			if (prop_ret[i++] == '\0')
diff --git a/app/cwm/xutil.c b/app/cwm/xutil.c
index b5680536d..ef492c3ea 100644
--- a/app/cwm/xutil.c
+++ b/app/cwm/xutil.c
@@ -15,7 +15,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $OpenBSD: xutil.c,v 1.74 2013/07/16 14:30:48 okan Exp $
+ * $OpenBSD: xutil.c,v 1.75 2013/10/03 13:52:00 okan Exp $
  */
 
 #include <sys/param.h>
@@ -106,7 +106,7 @@ xu_key_grab(Window win, u_int mask, KeySym keysym)
 }
 
 int
-xu_getprop(Window win, Atom atm, Atom type, long len, u_char **p)
+xu_getprop(Window win, Atom atm, Atom type, long len, unsigned char **p)
 {
 	Atom	 realtype;
 	u_long	 n, extra;
@@ -160,7 +160,7 @@ xu_get_wm_state(Window win, int *state)
 	long	*p = NULL;
 
 	if (xu_getprop(win, cwmh[WM_STATE], cwmh[WM_STATE], 2L,
-	    (u_char **)&p) <= 0)
+	    (unsigned char **)&p) <= 0)
 		return (-1);
 
 	*state = (int)*p;
@@ -331,7 +331,7 @@ xu_ewmh_get_net_wm_state(struct client_ctx *cc, int *n)
 	Atom	*state, *p = NULL;
 
 	if ((*n = xu_getprop(cc->win, ewmh[_NET_WM_STATE], XA_ATOM, 64L,
-	    (u_char **)&p)) <= 0)
+	    (unsigned char **)&p)) <= 0)
 		return (NULL);
 
 	state = xcalloc(*n, sizeof(Atom));