[PD-cvs] pd/src s_loader.c,1.4.4.5.2.5,1.4.4.5.2.6

[Thomas Grill]

Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32631/src

Modified Files:
      Tag: devel_0_39
	s_loader.c 
Log Message:
fix loader code for DL_OPEN

Index: s_loader.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_loader.c,v
retrieving revision 1.4.4.5.2.5
retrieving revision 1.4.4.5.2.6
diff -C2 -d -r1.4.4.5.2.5 -r1.4.4.5.2.6
*** s_loader.c	30 Nov 2005 13:36:58 -0000	1.4.4.5.2.5
--- s_loader.c	6 Mar 2006 14:51:00 -0000	1.4.4.5.2.6
***************
*** 3,6 ****
--- 3,12 ----
  * WARRANTIES, see the file, "LICENSE.txt," in this distribution.  */
  
+ /* This would be a possibility, but we define it in the makefile for now
+ #if defined(__APPLE__) && !defined(DL_OPEN)
+ #define DL_OPEN 1
+ #endif
+ */
+ 
  #ifdef DL_OPEN
  #include <dlfcn.h>
***************
*** 94,98 ****
          *lastdot = 0;
  
! #ifdef __APPLE__
      strcpy(symname, "_");
      strcat(symname, nameptr);
--- 100,104 ----
          *lastdot = 0;
  
! #if defined(__APPLE__) && !defined(DL_OPEN)
      strcpy(symname, "_");
      strcat(symname, nameptr);
***************
*** 111,116 ****
      if(!makeout) 
          post("%s: %s",filename,dlerror());
! #endif
! #ifdef MSW
      sys_bashfilename(filename, filename);
      ntdll = LoadLibrary(filename);
--- 117,121 ----
      if(!makeout) 
          post("%s: %s",filename,dlerror());
! #elif defined(MSW)
      sys_bashfilename(filename, filename);
      ntdll = LoadLibrary(filename);
***************
*** 122,127 ****
      }
      makeout = (t_xxx)GetProcAddress(ntdll, symname);  
! #endif
! #ifdef __APPLE__
      {
          NSObjectFileImage image; 
--- 127,131 ----
      }
      makeout = (t_xxx)GetProcAddress(ntdll, symname);  
! #elif defined(__APPLE__)
      {
          NSObjectFileImage image;