aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJan Djärv2005-05-03 18:19:34 +0000
committerJan Djärv2005-05-03 18:19:34 +0000
commit3a3563e9d95b5552c4c18d3d64feb77f9e202f92 (patch)
tree9b15ffee5018c9eff9ac07317f841f6c7bf28203 /src
parent9dd9ed204a94c9341a592e972f8e757989c809e6 (diff)
downloademacs-3a3563e9d95b5552c4c18d3d64feb77f9e202f92.tar.gz
emacs-3a3563e9d95b5552c4c18d3d64feb77f9e202f92.zip
* mac.c: #undef init_process so not to conflict with system headers.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/mac.c1
2 files changed, 5 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 100ac96481d..a646aa192db 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12005-05-03 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
2
3 * mac.c: #undef init_process so not to conflict with system headers.
4
12005-05-02 Richard M. Stallman <rms@gnu.org> 52005-05-02 Richard M. Stallman <rms@gnu.org>
2 6
3 * buffer.c (syms_of_buffer): Define cursor-in-non-selected-windows. 7 * buffer.c (syms_of_buffer): Define cursor-in-non-selected-windows.
diff --git a/src/mac.c b/src/mac.c
index e9930ada151..14257fdee94 100644
--- a/src/mac.c
+++ b/src/mac.c
@@ -27,6 +27,7 @@ Boston, MA 02111-1307, USA. */
27 27
28#include "lisp.h" 28#include "lisp.h"
29#include "process.h" 29#include "process.h"
30#undef init_process
30#include "systime.h" 31#include "systime.h"
31#include "sysselect.h" 32#include "sysselect.h"
32#include "blockinput.h" 33#include "blockinput.h"