[Gnash-commit] gnash/gui gtk_glue_agg.cpp gtk_glue_agg.h

[Dossy Shiobara]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Dossy Shiobara <dossy>  08/03/22 02:28:18

Modified files:
        gui            : gtk_glue_agg.cpp gtk_glue_agg.h 

Log message:
        Fix build for when ENABLE_MIT_SHM is false, such as on Win32.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtk_glue_agg.cpp?cvsroot=gnash&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtk_glue_agg.h?cvsroot=gnash&r1=1.16&r2=1.17

Patches:
Index: gtk_glue_agg.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gtk_glue_agg.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- gtk_glue_agg.cpp    5 Mar 2008 03:55:51 -0000       1.33
+++ gtk_glue_agg.cpp    22 Mar 2008 02:28:18 -0000      1.34
@@ -97,7 +97,11 @@
 {
     gdk_rgb_init();
     
+#ifdef ENABLE_MIT_SHM
     _have_shm = check_mit_shm(gdk_display);
+#else
+    _have_shm = false;
+#endif
     
     if (!detect_pixelformat()) {
       printf("FATAL: Could not detect the pixel format used by your X 
server.\n");
@@ -111,7 +115,11 @@
 }
 
 bool 
+#ifdef ENABLE_MIT_SHM
 GtkAggGlue::check_mit_shm(Display *display) 
+#else
+GtkAggGlue::check_mit_shm(void *display) 
+#endif
 {
 #ifdef ENABLE_MIT_SHM
   int major, minor, dummy;

Index: gtk_glue_agg.h
===================================================================
RCS file: /sources/gnash/gnash/gui/gtk_glue_agg.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- gtk_glue_agg.h      21 Jan 2008 20:55:42 -0000      1.16
+++ gtk_glue_agg.h      22 Mar 2008 02:28:18 -0000      1.17
@@ -25,6 +25,8 @@
 #include <gtk/gtk.h>
 #include <gdk/gdk.h>
 
+#undef ENABLE_MIT_SHM
+
 // Experimental support for MIT-SHM
 // see http://www.xfree86.org/current/mit-shm.html
 // currently has some problems, see https://savannah.gnu.org/bugs/?20301
@@ -61,10 +63,12 @@
 #ifdef ENABLE_MIT_SHM
     XImage *_shm_image;
     XShmSegmentInfo *_shm_info;
-#endif    
     
     /// Checks if the MIT-SHM extension is available (supported by the server)
     bool check_mit_shm(Display *display);
+#else
+    bool check_mit_shm(void *display);
+#endif    
     
     /// Tries to create a SHM image. 
     ///