summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/m/macppc.h4
2 files changed, 5 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 487ee00bd50..f5aa7306f89 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-10 Dan Nicolaescu <dann@ics.uci.edu>
+
+ * m/macppc.h (UNEXEC, NO_TERMIO): Don't define, the s/ files
+ define them.
+
2008-07-10 Kenichi Handa <handa@m17n.org>
* xfont.c (xfont_open): Log the reason of failure.
diff --git a/src/m/macppc.h b/src/m/macppc.h
index 81f939ef0d7..4adfcb50e7b 100644
--- a/src/m/macppc.h
+++ b/src/m/macppc.h
@@ -64,10 +64,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* #define NO_SOCK_SIGIO */
-#define UNEXEC unexelf.o
-
-#define NO_TERMIO
-
#if defined (LINUX) || defined (__NetBSD__) || defined (__OpenBSD__)
# define TEXT_END ({ extern int _etext; &_etext; })
#endif