SF.net SVN: alleg:[12699] allegro/branches/4.4/src/linux/svgalib.c

[<tj...@us...>]

Revision: 12699
          http://alleg.svn.sourceforge.net/alleg/?rev=12699&view=rev
Author:   tjaden
Date:     2009-10-30 23:01:26 +0000 (Fri, 30 Oct 2009)

Log Message:
-----------
Disable an block of code which prevented the SVGAlib driver working.

It checked for the presence of the /dev/svga device file when using
SVGAlib 1.9+, but as far as I know the svgalib_helper doesn't compile
with recent Linux kernels so the device won't exist.

Modified Paths:
--------------
    allegro/branches/4.4/src/linux/svgalib.c

Modified: allegro/branches/4.4/src/linux/svgalib.c
===================================================================
--- allegro/branches/4.4/src/linux/svgalib.c	2009-10-30 23:00:48 UTC (rev 12698)
+++ allegro/branches/4.4/src/linux/svgalib.c	2009-10-30 23:01:26 UTC (rev 12699)
@@ -496,11 +496,19 @@
       if (!svga_version2())
 	 seteuid(0);
       else {
+	 /* I don't remember why I put this code in eight years ago (!) and the
+	  * log message wasn't very good :-P  My guess is that a previous
+	  * version of SVGAlib 1.9.x would call exit() if the /dev/svga device
+	  * wasn't present.  However, as far as I know, the svgalib_helper
+	  * doesn't compile with recent kernels so the device won't exist. --pw
+	  */
+#if 0
 	 /* Avoid having SVGAlib calling exit() on us.  */
 	 int fd = open("/dev/svga", O_RDWR);
 	 if (fd < 0)
 	    return NULL;
 	 close(fd);
+#endif
       }
       vga_disabledriverreport();
       if (vga_init() != 0)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.