Package: freeglut
Followup-For: Bug #296242

This package now FTBFS on i386 with the same error. Alternative patch
below.

diff -u clean/freeglut_callbacks.c ./freeglut_callbacks.c
--- clean/freeglut_callbacks.c  2004-03-30 09:37:27.000000000 +0100
+++ ./freeglut_callbacks.c      2005-07-16 11:30:17.000000000 +0100
@@ -41,7 +41,7 @@
 #define SET_CALLBACK(a)              \
     if( fgStructure.Window == NULL ) \
         return;                      \
-    FETCH_WCB( ( *( fgStructure.Window ) ), a ) = callback;
+    SET_WCB( ( *( fgStructure.Window ) ), a, callback);
 
 /*
  * Sets the Display callback for the current window
diff -u clean/freeglut_internal.h ./freeglut_internal.h
--- clean/freeglut_internal.h   2004-03-30 09:37:27.000000000 +0100
+++ ./freeglut_internal.h       2005-07-16 11:29:52.000000000 +0100
@@ -373,6 +373,17 @@
 
 
 /*
+ * SET_WCB() is used as:
+ *
+ *     SET_WCB( window, Visibility, val);
+ *
+ * ...where {window} is the freeglut window to set the callback on,
+ *          {Visibility} is the window-specific callback to fetch.
+ */
+#define SET_WCB(window,cbname,val) \
+    ((window).CallBacks[CB_ ## cbname]) = (void *)val
+
+/*
  * FETCH_WCB() is used as:
  *
  *     FETCH_WCB( window, Visibility );
diff -u clean/freeglut_structure.c ./freeglut_structure.c
--- clean/freeglut_structure.c  2004-03-30 09:37:27.000000000 +0100
+++ ./freeglut_structure.c      2005-07-16 11:30:31.000000000 +0100
@@ -209,7 +209,7 @@
     {
         void *destroy = FETCH_WCB( *window, Destroy );
         fgClearCallBacks( window );
-        FETCH_WCB( *window, Destroy ) = destroy;
+        SET_WCB( *window, Destroy, destroy);
     }
 }
 

-- System Information:
Debian Release: testing/unstable
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: i386 (i686)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.12.2-f
Locale: LANG=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968)


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to