Revision: 44807
http://brlcad.svn.sourceforge.net/brlcad/?rev=44807&view=rev
Author: erikgreenwald
Date: 2011-06-07 20:45:35 +0000 (Tue, 07 Jun 2011)
Log Message:
-----------
more HAVE_DLOPEN removal
Modified Paths:
--------------
brlcad/trunk/src/liboptical/sh_stack.c
Modified: brlcad/trunk/src/liboptical/sh_stack.c
===================================================================
--- brlcad/trunk/src/liboptical/sh_stack.c 2011-06-07 20:43:55 UTC (rev
44806)
+++ brlcad/trunk/src/liboptical/sh_stack.c 2011-06-07 20:45:35 UTC (rev
44807)
@@ -119,9 +119,7 @@
{
register struct mfuncs *mfp;
-#ifdef HAVE_DLOPEN
register struct mfuncs *mfp_new;
-#endif
struct bu_vls arg;
char matname[32];
int ret;
@@ -145,16 +143,14 @@
}
matname[i] = '\0'; /* ensure null termination */
-#ifdef HAVE_DLOPEN
retry:
-#endif
for (mfp = *headp; mfp != MF_NULL; mfp = mfp->mf_forw) {
if (matname[0] != mfp->mf_name[0] ||
!BU_STR_EQUAL(matname, mfp->mf_name))
continue;
goto found;
}
-#ifdef HAVE_DLOPEN
+
/* If we get here, then the shader wasn't found in the list of
* compiled-in (or previously loaded) shaders. See if we can
* dynamically load it.
@@ -166,11 +162,7 @@
mlib_add_shader(headp, mfp_new);
goto retry;
}
-#else
- bu_log("****** dynamic shader loading not available ******\n");
-#endif
-
bu_log("stack_setup(%s): material not known\n",
matname);
ret = -1;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
EditLive Enterprise is the world's most technically advanced content
authoring tool. Experience the power of Track Changes, Inline Image
Editing and ensure content is compliant with Accessibility Checking.
http://p.sf.net/sfu/ephox-dev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
