Fixed gcc4 error messages.

2 files changed, 51 insertions, 1 deletions

diff --git a/wm/amaterus/distinfo b/wm/amaterus/distinfo
index ec2b5ae76ed..69972ba78bd 100644
--- a/wm/amaterus/distinfo
+++ b/wm/amaterus/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.3 2005/12/06 14:26:02 joerg Exp $
+$NetBSD: distinfo,v 1.4 2007/10/09 14:00:28 rillig Exp $
 
 SHA1 (amaterus-0.34.1.tar.gz) = e26381d8c9b4c36148a71d28dcacd48f3590afd5
 RMD160 (amaterus-0.34.1.tar.gz) = abbca6c6c89632342e1f3502942dd206d5c9db0d
 Size (amaterus-0.34.1.tar.gz) = 141802 bytes
 SHA1 (patch-aa) = f0cb7145fea376af2293b56ba05f5aa1be06e6e1
+SHA1 (patch-ab) = 2992ed4bf2f97fb0db19d826b3b7f47a99097e5c
diff --git a/wm/amaterus/patches/patch-ab b/wm/amaterus/patches/patch-ab
new file mode 100644
index 00000000000..704180dc738
--- /dev/null
+++ b/wm/amaterus/patches/patch-ab
@@ -0,0 +1,49 @@
+$NetBSD: patch-ab,v 1.1 2007/10/09 14:00:28 rillig Exp $
+
+Why would anyone want to cast a gint16 to a gint16?
+
+--- src/wmclient.h.orig	2000-10-30 21:25:19.000000000 +0100
++++ src/wmclient.h	2007-10-09 15:57:28.000000000 +0200
+@@ -20,24 +20,24 @@ extern "C" {
+ #define WM_CLIENT_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, wm_client_get_type (), WmClientClass)
+ #define IS_WM_CLIENT(obj)       GTK_CHECK_TYPE (obj, wm_client_get_type ())
+ 
+-#define WM_CLIENT_X(obj)      ((gint16)(((WmClient *)obj)->x))
+-#define WM_CLIENT_Y(obj)      ((gint16)(((WmClient *)obj)->y))
+-#define WM_CLIENT_X_PREV(obj)  ((guint16)((WmClient *)obj)->priviousX)
+-#define WM_CLIENT_Y_PREV(obj) ((guint16)((WmClient *)obj)->priviousY)
+-#define WM_CLIENT_WIDTH(obj)  ((guint16)((WmClient *)obj)->width)
+-#define WM_CLIENT_HEIGHT(obj) ((guint16)((WmClient *)obj)->height)
+-#define WM_CLIENT_W_PREV(obj)  ((guint16)((WmClient *)obj)->priviousWidth)
+-#define WM_CLIENT_H_PREV(obj) ((guint16)((WmClient *)obj)->priviousHeight)
+-#define WM_CLIENT_SIZE_FLAG(obj) ((guint16)((WmClient *)obj)->size_flags)
+-#define WM_CLIENT_W_INC(obj)  ((gint16)((WmClient *)obj)->width_inc)
+-#define WM_CLIENT_H_INC(obj)  ((gint16)((WmClient *)obj)->height_inc)
+-#define WM_CLIENT_W_BASE(obj)  ((gint16)((WmClient *)obj)->base_width)
+-#define WM_CLIENT_H_BASE(obj)  ((gint16)((WmClient *)obj)->base_height)
+-#define WM_CLIENT_W_MIN(obj)  ((gint16)((WmClient *)obj)->min_width)
+-#define WM_CLIENT_H_MIN(obj)  ((gint16)((WmClient *)obj)->min_height)
+-#define WM_CLIENT_W_MAX(obj)  ((gint16)((WmClient *)obj)->max_width)
+-#define WM_CLIENT_H_MAX(obj)  ((gint16)((WmClient *)obj)->max_height)
+-#define WM_CLIENT_STATE(obj)  ((gint16)((WmClient *)obj)->state)
++#define WM_CLIENT_X(obj)      ((((WmClient *)obj)->x))
++#define WM_CLIENT_Y(obj)      ((((WmClient *)obj)->y))
++#define WM_CLIENT_X_PREV(obj)  (((WmClient *)obj)->priviousX)
++#define WM_CLIENT_Y_PREV(obj) (((WmClient *)obj)->priviousY)
++#define WM_CLIENT_WIDTH(obj)  (((WmClient *)obj)->width)
++#define WM_CLIENT_HEIGHT(obj) (((WmClient *)obj)->height)
++#define WM_CLIENT_W_PREV(obj)  (((WmClient *)obj)->priviousWidth)
++#define WM_CLIENT_H_PREV(obj) (((WmClient *)obj)->priviousHeight)
++#define WM_CLIENT_SIZE_FLAG(obj) (((WmClient *)obj)->size_flags)
++#define WM_CLIENT_W_INC(obj)  (((WmClient *)obj)->width_inc)
++#define WM_CLIENT_H_INC(obj)  (((WmClient *)obj)->height_inc)
++#define WM_CLIENT_W_BASE(obj)  (((WmClient *)obj)->base_width)
++#define WM_CLIENT_H_BASE(obj)  (((WmClient *)obj)->base_height)
++#define WM_CLIENT_W_MIN(obj)  (((WmClient *)obj)->min_width)
++#define WM_CLIENT_H_MIN(obj)  (((WmClient *)obj)->min_height)
++#define WM_CLIENT_W_MAX(obj)  (((WmClient *)obj)->max_width)
++#define WM_CLIENT_H_MAX(obj)  (((WmClient *)obj)->max_height)
++#define WM_CLIENT_STATE(obj)  (((WmClient *)obj)->state)
+ #define WM_CLIENT_BORDER_WIDTH(obj)  ((guint16)((WmClient *)obj)->border_width)
+ #define WM_CLIENT_BORDER_FRAME(obj)  ((gchar *)((WmClient *)obj)->border_frame)
+ #define WM_CLIENT_GROUP(obj)  (((WmClient *)obj)->group)