* makefile.MPW: Add dependencies for fringe.c.x, image.c.x, and

lastfile.c.x.
(PPCCOptions): Add -alloca.
(EmacsObjects): Remove alloca.c.x.  Add fringe.c.x, image.c.x, and
lastfile.c.x.
(Emacs MPW): Add QuickTimeLib.
(EmacsSource): Remove alloca.c.  Add fringe.c, image.c, and
lastfile.c.
(LispSource): Fix pathnames for byte-run.elc, float-sup.elc, and
map-ynp.elc.
* inc/config.h (USE_LSB_TAG) [__MRC__]: Define.
(UNEXEC_SRC): Close comment.
* inc/epaths.h (PATH_BITMAPS, PATH_GAME): New defines.
* inc/m-mac.h (HAVE_ALLOCA) [__MRC__]: Define.
(C_ALLOCA) [__MRC__]: Don't define.
* inc/s-mac.h (X_OK): New define.
(DECL_ALIGN) [USE_LSB_TAG && __MRC__]: New macro.
(GC_MARK_STACK): Define to GC_MAKE_GCPROS_NOOPS.

4 files changed, 30 insertions, 3 deletions

diff --git a/mac/inc/config.h b/mac/inc/config.h
index b7257f35f35..859ef017bc6 100644
--- a/mac/inc/config.h
+++ b/mac/inc/config.h
@@ -261,7 +261,7 @@ Boston, MA 02111-1307, USA.  */
 
 /* #undef CRAY_STACKSEG_END */
 
-/* #undef UNEXEC_SRC unexelf.c
+/* #undef UNEXEC_SRC */
 
 /* #undef HAVE_LIBXBSD */
 /* #undef HAVE_XRMSETDATABASE */
@@ -367,6 +367,13 @@ Boston, MA 02111-1307, USA.  */
 /* #undef _XOPEN_SOURCE */
 
 #ifdef __MRC__
+/* Use low-bits for tags.  If ENABLE_CHECKING is turned on together
+   with USE_LSB_TAG, optimization flags should be explicitly turned
+   off.  */
+#define USE_LSB_TAG
+#endif
+
+#ifdef __MRC__
 #define EMACS_CONFIGURATION "macos-mpw"
 #else  /* Assume CodeWarrior */
 #define EMACS_CONFIGURATION "macos-cw"
diff --git a/mac/inc/epaths.h b/mac/inc/epaths.h
index 8c9bbd2f8ba..96027388e3f 100644
--- a/mac/inc/epaths.h
+++ b/mac/inc/epaths.h
@@ -46,7 +46,7 @@ Boston, MA 02111-1307, USA.  */
 
 /* Where Emacs should look for X bitmap files.
    The lisp variable x-bitmap-file-path is set based on this value.  */
-/* #define PATH_BITMAPS "/usr/include/X11/bitmaps" */
+#define PATH_BITMAPS ""
 
 /* Where Emacs should look for its docstring file.  The lisp variable
    doc-directory is set to this value.  */
@@ -57,6 +57,9 @@ Boston, MA 02111-1307, USA.  */
    macro, and is then used to set the Info-default-directory-list.  */
 #define PATH_INFO "~emacs/info"
 
+/* Where Emacs should store game score files.  */
+#define PATH_GAME "~emacs/games"
+
 /* Where Emacs should look for the application default file. */
 /* #define PATH_X_DEFAULTS "/usr/lib/X11/%L/%T/%N%C%S:/usr/lib/X11/%l/%T/%N%C%S:/usr/lib/X11/%T/%N%C%S:/usr/lib/X11/%L/%T/%N%S:/usr/lib/X11/%l/%T/%N%S:/usr/lib/X11/%T/%N%S" */
 
diff --git a/mac/inc/m-mac.h b/mac/inc/m-mac.h
index f3f6f084b34..bb4011af4a6 100644
--- a/mac/inc/m-mac.h
+++ b/mac/inc/m-mac.h
@@ -87,8 +87,11 @@ Boston, MA 02111-1307, USA.  */
    Define neither one if an assembler-language alloca
    in the file alloca.s should be used.  */
 
+#ifdef __MRC__
+#define HAVE_ALLOCA
+#else
 #define C_ALLOCA
-/* #define HAVE_ALLOCA */
+#endif
 
 /* Define NO_REMAP if memory segmentation makes it not work well
    to change the boundary between the text section and data section
diff --git a/mac/inc/s-mac.h b/mac/inc/s-mac.h
index c187944ae6b..2905692aac0 100644
--- a/mac/inc/s-mac.h
+++ b/mac/inc/s-mac.h
@@ -255,6 +255,10 @@ void read_input_waiting ();
 #include <unistd.h>
 #endif
 
+#ifndef X_OK
+#define X_OK 01
+#endif
+
 #undef unlink
 #define unlink sys_unlink
 #undef read
@@ -319,5 +323,15 @@ extern double atof (const char *);
 
 #define SYMS_SYSTEM syms_of_mac()
 
+#ifdef USE_LSB_TAG
+#ifdef __MRC__
+#define DECL_ALIGN(type, var) type var
+#endif
+#endif
+
+/* Use the GC_MAKE_GCPROS_NOOPS (see lisp.h) method for marking the
+   stack.  */
+#define GC_MARK_STACK   GC_MAKE_GCPROS_NOOPS
+
 /* arch-tag: 6a941c4b-a419-4d25-80ac-9335053e58b2
    (do not change this comment) */