[Gridflow-dev] format/x11.c broken when X11 but not X11_SHM

[Claude Heiland-Allen]

Hi,

Small typo (braces/#if incorrectly nested) leads to this under rare 
conditions:

format/x11.c.fcs: In member function 'bool FormatX11::alloc_image(int, 
int)':
format/x11.c.fcs:442: error: a function-definition is not allowed here 
before '{' token
format/x11.c.fcs:657: error: expected `}' at end of input

This patch fixes it:

--- x11.c       2008-06-06 23:57:41.000000000 +0100
+++ x11.c.fixed 2008-06-17 18:01:12.000000000 +0100
@@ -395,8 +395,8 @@
                 // yes, this can be done now. should cause auto-cleanup.
                 shmctl(shm_info->shmid,IPC_RMID,0);
                 if (!shared_memory) return alloc_image(sx,sy);
-       }
  #endif
+       }
  #ifdef HAVE_X11_XVIDEO
         if (xvideo) {
                 unsigned int ver, rel, req, ev, err, i, j, adaptors, 
formats;



Claude
-- 
http://claudiusmaximus.goto10.org