Subject: Fvwm doesn't compile without iconv

From: Tim Phipps <[email-masked]>
Date: Wed, 05 Dec 2001 12:03:06 +0000

Configuration Information [Automatically generated, do not change]:
uname output: SunOS silver 5.5.1 Generic_103640-38 sun4u sparc SUNW,Ultra-5_10
Compiler: gcc
Compilation CFLAGS: -g -O2 -Wall
prefix: /u/phippst/sunos

FVWM Version:	2.5.0
FVWM_MODULEDIR:	/u/phippst/sunos/libexec/fvwm/2.5.0
FVWM_DATADIR:	/u/phippst/sunos/share/fvwm
FVWM_USERDIR:	/u/phippst/.fvwm

Description:
	If iconv isn't available fvwm/ewmh.c doesn't compile

Fix:
	I'll reply with a patch.

--
Visit the official FVWM web page at <URL:http://www.fvwm.org/>.
To unsubscribe from the list, send "unsubscribe fvwm-workers" in the
body of a message to [email-masked].
To report problems, send mail to [email-masked]

---

From: Tim Phipps <[email-masked]>
Date: Wed, 05 Dec 2001 12:08:40 +0000

Here's a path that fixes the problem.

Cheers,
Tim.
Index: fvwm/ewmh.c
===================================================================
RCS file: /u/phippst/share/cvsroot/fvwm/fvwm/ewmh.c,v
retrieving revision 1.3
diff -u -r1.3 ewmh.c
--- fvwm/ewmh.c	2001/11/26 15:37:37	1.3
+++ fvwm/ewmh.c	2001/12/05 11:44:27
@@ -151,8 +151,8 @@
 {
   ENTRY("_NET_WM_ICON",          XA_CARDINAL, ewmh_WMIcon),
   ENTRY("_NET_WM_ICON_GEOMETRY", XA_CARDINAL, ewmh_WMIconGeometry),
-  ENTRY("_NET_WM_ICON_NAME",     None,        EWMH_WMIconName),
-  ENTRY("_NET_WM_NAME",          None,        EWMH_WMName),
+  ENTRY("_NET_WM_ICON_NAME",     None,        EWMH_WMIconName_func),
+  ENTRY("_NET_WM_NAME",          None,        EWMH_WMName_func),
   ENTRY("_NET_WM_STRUT",         XA_CARDINAL, ewmh_WMStrut),
   {NULL,0,0,0}
 };
Index: fvwm/ewmh.h
===================================================================
RCS file: /u/phippst/share/cvsroot/fvwm/fvwm/ewmh.h,v
retrieving revision 1.3
diff -u -r1.3 ewmh.h
--- fvwm/ewmh.h	2001/11/26 15:37:37	1.3
+++ fvwm/ewmh.h	2001/12/05 11:42:23
@@ -69,11 +69,15 @@
 #ifdef HAVE_ICONV
 void EWMH_SetVisibleName(FvwmWindow *fwin, Bool is_icon_name);
 int EWMH_WMName(FvwmWindow *fwin, XEvent *ev, window_style *style);
+#define EWMH_WMName_func EWMH_WMName
 int EWMH_WMIconName(FvwmWindow *fwin, XEvent *ev, window_style *style);
+#define EWMH_WMIconName_func EWMH_WMIconName
 #else
 #define EWMH_SetVisibleName(x,y)
 #define EWMH_WMName(x,y,z)     0
+#define EWMH_WMName_func       0
 #define EWMH_WMIconName(x,y,z) 0
+#define EWMH_WMIconName_func   0
 #endif /* HAVE_ICONV */
 
 #else /* HAVE_EWMH */