diff options
author | Yong Luk Stanley Elijah Goh <stan@t0xt.com> | 2010-08-20 05:55:31 +0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-24 10:55:02 -0700 |
commit | 89fea23de593344fbe250e95f80e264777a69593 (patch) | |
tree | 06ad2389a27b7169496ea90305a6ef1a8702df5d | |
parent | 834bfd37aa8a7342289bd71a0bf196e1591cb442 (diff) | |
download | uemacs-89fea23de593344fbe250e95f80e264777a69593.tar.gz |
uemacs: Compiles on Mac OS X.
Compiles on Mac OS X 10.6.4.
setmode() is renamed to setemode() to avoid conflict with OS X's unistd.h's
setmode().
Modify Makefile to enable the appropriate DEFINES to compile on Mac OS X.
Signed-off-by: Yong Luk Stanley Elijah Goh <stan@t0xt.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | Makefile | 1 | ||||
-rw-r--r-- | ebind.h | 2 | ||||
-rw-r--r-- | efunc.h | 2 | ||||
-rw-r--r-- | estruct.h | 7 | ||||
-rw-r--r-- | names.c | 2 | ||||
-rw-r--r-- | random.c | 2 |
6 files changed, 12 insertions, 4 deletions
@@ -34,6 +34,7 @@ CFLAGS=-O2 $(WARNINGS) #CFLAGS=-O4 -DSVR4 # Sun #CFLAGS=-O -qchars=signed # RS/6000 DEFINES=-DAUTOCONF -DPOSIX -DUSG -D_BSD_SOURCE -D_SVID_SOURCE -D_XOPEN_SOURCE=600 # Linux +#DEFINES=-DAUTOCONF -DPOSIX -DSYSV -D_DARWIN_C_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE -D_XOPEN_SOURCE=600 # Mac OS X #DEFINES=-DAUTOCONF #LIBS=-ltermcap # BSD LIBS=-lcurses # SYSV @@ -162,7 +162,7 @@ struct key_tab keytab[NBINDS] = { , {CTLX | 'K', killbuffer} , - {CTLX | 'M', setmode} + {CTLX | 'M', setemode} , {CTLX | 'N', filename} , @@ -107,7 +107,7 @@ extern int indent(int f, int n); extern int forwdel(int f, int n); extern int backdel(int f, int n); extern int killtext(int f, int n); -extern int setmode(int f, int n); +extern int setemode(int f, int n); extern int delmode(int f, int n); extern int setgmode(int f, int n); extern int delgmode(int f, int n); @@ -713,3 +713,10 @@ typedef struct { char *rstr; } RMC; #endif + +/* Since Mac OS X's termios.h doesn't have the following 2 macros, define them. + */ +#if defined(SYSV) && defined(_DARWIN_C_SOURCE) +#define OLCUC 0000002 +#define XCASE 0000004 +#endif @@ -11,7 +11,7 @@ struct name_bind names[] = { {"abort-command", ctrlg}, - {"add-mode", setmode}, + {"add-mode", setemode}, {"add-global-mode", setgmode}, #if APROP {"apropos", apro}, @@ -829,7 +829,7 @@ int killtext(int f, int n) * * int f, n; default and argument */ -int setmode(int f, int n) +int setemode(int f, int n) { #if PKCODE return adjustmode(TRUE, FALSE); |