aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2011-04-15 20:13:28 -0700
committerPaul Eggert2011-04-15 20:13:28 -0700
commit1086c0956d60c03c3b396bc7b79f6c020d5b3b14 (patch)
treec6fd850e5014110aac20272068230df7c99506da /src
parentdde42981250a59d7374b927fafb78525c82be1eb (diff)
downloademacs-1086c0956d60c03c3b396bc7b79f6c020d5b3b14.tar.gz
emacs-1086c0956d60c03c3b396bc7b79f6c020d5b3b14.zip
* fns.c (vector): Remove; this old hack is no longer needed.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/fns.c5
2 files changed, 2 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 325c6ee8434..ec6a1a28429 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
12011-04-16 Paul Eggert <eggert@cs.ucla.edu> 12011-04-16 Paul Eggert <eggert@cs.ucla.edu>
2 2
3 * fns.c (vector): Remove; this old hack is no longer needed.
4
3 * xsmfns.c (create_client_leader_window): Rename shadowing arg. 5 * xsmfns.c (create_client_leader_window): Rename shadowing arg.
4 Remove unused var. 6 Remove unused var.
5 (gdk_x11_set_sm_client_id) [!USE_GTK]: Don't define. 7 (gdk_x11_set_sm_client_id) [!USE_GTK]: Don't define.
diff --git a/src/fns.c b/src/fns.c
index d3009775b81..c057f64469c 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -23,11 +23,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
23#include <time.h> 23#include <time.h>
24#include <setjmp.h> 24#include <setjmp.h>
25 25
26/* Note on some machines this defines `vector' as a typedef,
27 so make sure we don't use that name in this file. */
28#undef vector
29#define vector *****
30
31#include "lisp.h" 26#include "lisp.h"
32#include "commands.h" 27#include "commands.h"
33#include "character.h" 28#include "character.h"