Subject: FVWM: Re: problem with FvwmPager on amd64

From: "Harald Dunkel" <[email-masked]>
Date: Thu, 08 Jul 2004 18:55:42 +0200

Hi folks,

Attached you can find a small patch to make FvwmPager
work on amd64. It fixes 2 alignment problems.

Regards

Harri
diff -ur orig/fvwm-snap-20040707/fvwm/fvwm.h fvwm-snap-20040707/fvwm/fvwm.h
--- orig/fvwm-snap-20040707/fvwm/fvwm.h	2004-05-31 13:00:01.000000000 +0200
+++ fvwm-snap-20040707/fvwm/fvwm.h	2004-07-08 18:33:26.222001347 +0200
@@ -675,7 +675,7 @@
 
 	/* Note: if the type of this variable is changed, do update the
 	 * CONFIGARGSNEW macro in module_interface.c, libs/vpacket.h too! */
-	short boundary_width;
+	int boundary_width;
 	short unshaped_boundary_width;
 	short corner_width;
 	short visual_corner_width;
@@ -688,7 +688,7 @@
 	/* Note: if the type of this variable is changed, do update the
 	 * CONFIGARGSNEW macro in module_interface.c, libs/vpacket.h and too!
 	 */
-	short title_thickness;
+	int title_thickness;
 	rotation_t title_text_rotation;
 	struct
 	{
diff -ur orig/fvwm-snap-20040707/fvwm/module_interface.c fvwm-snap-20040707/fvwm/module_interface.c
--- orig/fvwm-snap-20040707/fvwm/module_interface.c	2004-06-30 13:00:03.000000000 +0200
+++ fvwm-snap-20040707/fvwm/module_interface.c	2004-07-08 18:28:10.951771342 +0200
@@ -1168,9 +1168,9 @@
 	    &(*(_t))->Desk,\
 	    (unsigned long)(0),\
 	    &(*(_t))->layer,\
-	    (unsigned long)(sizeof(short)),\
+	    (unsigned long)(0),\
 	    &(*(_t))->title_thickness,\
-	    (unsigned long)(sizeof(short)),\
+	    (unsigned long)(0),\
 	    &(*(_t))->boundary_width,\
 	    (unsigned long)(0),\
 	    &(*(_t))->hints.base_width,\
diff -ur orig/fvwm-snap-20040707/libs/vpacket.h fvwm-snap-20040707/libs/vpacket.h
--- orig/fvwm-snap-20040707/libs/vpacket.h	2003-06-30 13:30:03.000000000 +0200
+++ fvwm-snap-20040707/libs/vpacket.h	2004-07-08 18:32:56.428669048 +0200
@@ -34,8 +34,8 @@
 	*/
 	unsigned long int  layer;
 
-	unsigned short int title_height;
-	unsigned short int border_width;
+	unsigned int title_height;
+	unsigned int border_width;
 	unsigned long int  hints_base_width;
 	unsigned long int  hints_base_height;
 	unsigned long int  hints_width_inc;