Commit bb4c0e89 authored by YAMAMOTO Mitsuharu's avatar YAMAMOTO Mitsuharu
Browse files

(__restrict, struct kboard): Remove outdated workarounds.

(C_SWITCH_SYSTEM): Remove `-I../mac/src'.
parent 89c28790
...@@ -121,7 +121,7 @@ Boston, MA 02110-1301, USA. */ ...@@ -121,7 +121,7 @@ Boston, MA 02110-1301, USA. */
* default for process-connection-type dependent on the kernel * default for process-connection-type dependent on the kernel
* version. * version.
*/ */
#define MIN_PTY_KERNEL_VERSION '7' #define MIN_PTY_KERNEL_VERSION '7'
/* /*
* Define NONSYSTEM_DIR_LIBRARY to make Emacs emulate * Define NONSYSTEM_DIR_LIBRARY to make Emacs emulate
...@@ -216,9 +216,6 @@ Boston, MA 02110-1301, USA. */ ...@@ -216,9 +216,6 @@ Boston, MA 02110-1301, USA. */
also the name of a Mach system call. */ also the name of a Mach system call. */
#define init_process emacs_init_process #define init_process emacs_init_process
/* Fix compilation problem for regex.c. */
#define __restrict
/* Used in dispnew.c. Copied from freebsd.h. */ /* Used in dispnew.c. Copied from freebsd.h. */
#define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base) #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base)
...@@ -262,9 +259,8 @@ Boston, MA 02110-1301, USA. */ ...@@ -262,9 +259,8 @@ Boston, MA 02110-1301, USA. */
/* Definitions for how to compile & link. */ /* Definitions for how to compile & link. */
/* Indicate that we are compiling for Mac OS X and where to find Mac /* Indicate that we are compiling for Mac OS X. */
specific headers. */ #define C_SWITCH_SYSTEM -fpascal-strings -DMAC_OSX
#define C_SWITCH_SYSTEM -fpascal-strings -DMAC_OSX -I../mac/src
/* Link in the Carbon lib. */ /* Link in the Carbon lib. */
#ifdef HAVE_CARBON #ifdef HAVE_CARBON
...@@ -317,13 +313,6 @@ Boston, MA 02110-1301, USA. */ ...@@ -317,13 +313,6 @@ Boston, MA 02110-1301, USA. */
#define NO_MATHERR #define NO_MATHERR
/* This prevents a compilation error in xfaces.c: struct kboard * is
used in a function protocol the first time this type appears in the
file, since MULTI_KBOARD is undefined for the Mac OS X build. */
#ifndef NOT_C_CODE
struct kboard;
#endif
/* The following solves the problem that Emacs hangs when evaluating /* The following solves the problem that Emacs hangs when evaluating
(make-comint "test0" "/nodir/nofile" nil "") when /nodir/nofile (make-comint "test0" "/nodir/nofile" nil "") when /nodir/nofile
does not exist. */ does not exist. */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment