[Vm-dev] [commit] r2375 - Remove reference to undefined symbol "error". Resolve symbols eagerly on FreeBSD.

[commits at squeakvm.org]

Author: piumarta
Date: 2011-03-30 18:48:46 -0700 (Wed, 30 Mar 2011)
New Revision: 2375

Modified:
   trunk/platforms/unix/ChangeLog
   trunk/platforms/unix/vm-display-X11/sqUnixX11.c
   trunk/platforms/unix/vm/sqUnixExternalPrims.c
Log:
Remove reference to undefined symbol "error".  Resolve symbols eagerly on FreeBSD.

Modified: trunk/platforms/unix/ChangeLog
===================================================================
--- trunk/platforms/unix/ChangeLog	2011-03-30 08:24:30 UTC (rev 2374)
+++ trunk/platforms/unix/ChangeLog	2011-03-31 01:48:46 UTC (rev 2375)
@@ -1,3 +1,9 @@
+2011-03-31  Ian Piumarta  <piumarta at freebsd.piumarta.com>
+
+	* vm/sqUnixExternalPrims.c: Resolve symbols eagerly on FreeBSD.
+
+	* vm-display-X11/sqUnixX11.c (initPixmap): Remove reference to undefined function "error".
+
 2011-03-30  Ian Piumarta  <piumarta at freebsd.piumarta.com>
 
 	* plugins/FloatMathPlugin/config.cmake: Re-enable GCC optimisations.

Modified: trunk/platforms/unix/vm/sqUnixExternalPrims.c
===================================================================
--- trunk/platforms/unix/vm/sqUnixExternalPrims.c	2011-03-30 08:24:30 UTC (rev 2374)
+++ trunk/platforms/unix/vm/sqUnixExternalPrims.c	2011-03-31 01:48:46 UTC (rev 2375)
@@ -100,11 +100,6 @@
   extern int sqIgnorePluginErrors;
 #endif
 
-#if defined(__FreeBSD__)
-# undef RTLD_NOW
-# define RTLD_NOW RTLD_LAZY
-#endif
-
 /*** options ***/
 
 extern char *squeakPlugins;

Modified: trunk/platforms/unix/vm-display-X11/sqUnixX11.c
===================================================================
--- trunk/platforms/unix/vm-display-X11/sqUnixX11.c	2011-03-30 08:24:30 UTC (rev 2374)
+++ trunk/platforms/unix/vm-display-X11/sqUnixX11.c	2011-03-31 01:48:46 UTC (rev 2375)
@@ -3073,7 +3073,7 @@
 	for (b= 0; b < 6; b++)
 	  {
 	    int i= 40 + ((36 * r) + (6 * b) + g);
-	    if (i > 255) error("index out of range in color table compuation");
+	    /* if (i > 255) error("index out of range in color table compuation"); */
 	    initColourmap(i, (r * 65535) / 5, (g * 65535) / 5, (b * 65535) / 5);
 	  }
   }