pd/src s_loader.c,1.4.4.5.2.8,1.4.4.5.2.9 - Pd-cvs

28 Jul 2006


      Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17781
Modified Files:
      Tag: devel_0_39
    s_loader.c 
Log Message:
if OSX 10.3+, use DL_OPEN, otherwise use deprecated NSBundle loading code
Index: s_loader.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_loader.c,v
retrieving revision 1.4.4.5.2.8
retrieving revision 1.4.4.5.2.9
diff -C2 -d -r1.4.4.5.2.8 -r1.4.4.5.2.9
*** s_loader.c	14 Mar 2006 08:36:12 -0000	1.4.4.5.2.8
--- s_loader.c	28 Jul 2006 14:23:37 -0000	1.4.4.5.2.9
***************
*** 3,11 ****
  * 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
--- 3,12 ----
  * WARRANTIES, see the file, "LICENSE.txt," in this distribution.  */
! #ifdef __APPLE__
! #include <AvailabilityMacros.h>
! #if defined(MAC_OS_X_VERSION_10_3) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3
! #define DL_OPEN
! #endif
  #endif
#ifdef DL_OPEN
***************
*** 20,24 ****
  #include <windows.h>
  #endif
! #ifdef __APPLE__
  #include <mach-o/dyld.h> 
  #endif
--- 21,25 ----
  #include <windows.h>
  #endif
! #if defined(__APPLE__) && !defined(DL_OPEN)
  #include <mach-o/dyld.h> 
  #endif
***************
*** 165,169 ****
      makeout = (t_xxx)GetProcAddress(ntdll, symname);  
      if(!makeout)makeout = (t_xxx)GetProcAddress(ntdll, altsymname);
! #elif defined(__APPLE__)
      {
          NSObjectFileImage image; 
--- 166,170 ----
      makeout = (t_xxx)GetProcAddress(ntdll, symname);  
      if(!makeout)makeout = (t_xxx)GetProcAddress(ntdll, altsymname);
! #elif defined(__APPLE__) && !defined(DL_OPEN)
      {
          NSObjectFileImage image;