[Emacs-diffs] Changes to emacs/src/s/darwin.h

[Steven Tamm]

Index: emacs/src/s/darwin.h
diff -c emacs/src/s/darwin.h:1.15 emacs/src/s/darwin.h:1.16
*** emacs/src/s/darwin.h:1.15   Thu Feb 26 17:46:48 2004
--- emacs/src/s/darwin.h        Thu Sep  2 17:02:11 2004
***************
*** 243,253 ****
     specific headers.  */
  #define C_SWITCH_SYSTEM -fpascal-strings -fno-common -DMAC_OSX -I../mac/src
  
! /* Link in the Carbon lib.  The -headerpad option tells ld (see man
!    page) to leave room at the end of the header for adding load
!    commands.  Needed for dumping.  0x690 is the total size of 30
!    segment load commands (at 56 each).  */
! #define LD_SWITCH_SYSTEM_TEMACS -prebind -framework Carbon -framework 
QuickTime -lstdc++ -Xlinker -headerpad -Xlinker 690
  
  #define C_SWITCH_SYSTEM_TEMACS -Dtemacs
  
--- 243,260 ----
     specific headers.  */
  #define C_SWITCH_SYSTEM -fpascal-strings -fno-common -DMAC_OSX -I../mac/src
  
! /* Link in the Carbon lib. */
! #ifdef HAVE_CARBON
! #define LIBS_CARBON -framework Carbon -framework QuickTime
! #else
! #define LIBS_CARBON -framework Carbon
! #endif
! 
! /* The -headerpad option tells ld (see man page) to leave room at the
!    end of the header for adding load commands.  Needed for dumping.
!    0x690 is the total size of 30 segment load commands (at 56
!    each).  */
! #define LD_SWITCH_SYSTEM_TEMACS -prebind LIBS_CARBON -Xlinker -headerpad 
-Xlinker 690
  
  #define C_SWITCH_SYSTEM_TEMACS -Dtemacs