aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/fns.c1
2 files changed, 5 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index acd04632654..45ed1940675 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12009-10-20 Juanma Barranquero <lekktu@gmail.com>
2
3 * fns.c: Add #endif accidentally removed in previous change.
4
12009-10-19 Dan Nicolaescu <dann@ics.uci.edu> 52009-10-19 Dan Nicolaescu <dann@ics.uci.edu>
2 6
3 * fns.c: Remove code for unsupported system: MAC_OS. 7 * fns.c: Remove code for unsupported system: MAC_OS.
diff --git a/src/fns.c b/src/fns.c
index 06c6b6772aa..10d755ccea7 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -46,6 +46,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
46#if defined (HAVE_X_WINDOWS) 46#if defined (HAVE_X_WINDOWS)
47#include "xterm.h" 47#include "xterm.h"
48#endif 48#endif
49#endif /* HAVE_MENUS */
49 50
50#ifndef NULL 51#ifndef NULL
51#define NULL ((POINTER_TYPE *)0) 52#define NULL ((POINTER_TYPE *)0)