diff src/s/darwin.h @ 109859:68616bb3ae25

merged from trunk

--- a/src/s/darwin.h	Mon Jun 14 11:16:39 2010 +0200
+++ b/src/s/darwin.h	Mon Jun 14 11:48:51 2010 +0200
@@ -99,9 +99,6 @@
    for process-connection-type dependent on the kernel version.  */
 #define MIN_PTY_KERNEL_VERSION '7'
 
-/* Define this symbol if your system has the functions bcopy, etc. */
-#define BSTRING
-
 /* Define CLASH_DETECTION if you want lock files to be written
    so that Emacs can tell instantly when you try to modify
    a file that someone else has modified in his Emacs.  */
@@ -123,9 +120,6 @@
 /* Define HAVE_SOCKETS if system supports 4.2-compatible sockets.  */
 #define HAVE_SOCKETS
 
-/* Definitions for how to dump.  Copied from nextstep.h.  */
-#define UNEXEC unexmacosx.o
-
 /* start_of_text isn't actually used, so make it compile without error.  */
 #define TEXT_START (0)
 
@@ -147,9 +141,6 @@
 #undef HAVE_POSIX_MEMALIGN
 #endif
 
-/* Link this program just by running cc.  */
-#define ORDINARY_LINK
-
 /* Define the following so emacs symbols will not conflict with those
    in the System framework.  Otherwise -prebind will not work.  */