Mercurial > emacs
comparison src/fns.c @ 50301:c0f3ec529c05
Allow building on Mac OS X again after Kim's merging of display code.
author | Andrew Choi <akochoi@shaw.ca> |
---|---|
date | Mon, 24 Mar 2003 19:59:08 +0000 |
parents | 95557d4395b0 |
children | 6a4e89f0d078 |
comparison
equal
deleted
inserted
replaced
50300:7e4e15b857f3 | 50301:c0f3ec529c05 |
---|---|
24 #ifdef HAVE_UNISTD_H | 24 #ifdef HAVE_UNISTD_H |
25 #include <unistd.h> | 25 #include <unistd.h> |
26 #endif | 26 #endif |
27 #include <time.h> | 27 #include <time.h> |
28 | 28 |
29 #ifndef MAC_OSX | |
30 /* On Mac OS X, defining this conflicts with precompiled headers. */ | |
31 | |
29 /* Note on some machines this defines `vector' as a typedef, | 32 /* Note on some machines this defines `vector' as a typedef, |
30 so make sure we don't use that name in this file. */ | 33 so make sure we don't use that name in this file. */ |
31 #undef vector | 34 #undef vector |
32 #define vector ***** | 35 #define vector ***** |
36 | |
37 #endif /* ! MAC_OSX */ | |
38 | |
33 #include "lisp.h" | 39 #include "lisp.h" |
34 #include "commands.h" | 40 #include "commands.h" |
35 #include "charset.h" | 41 #include "charset.h" |
36 #include "coding.h" | 42 #include "coding.h" |
37 #include "buffer.h" | 43 #include "buffer.h" |