aboutsummaryrefslogtreecommitdiffstats
path: root/lib-src
diff options
context:
space:
mode:
authorPaul Eggert2011-05-22 17:09:23 -0700
committerPaul Eggert2011-05-22 17:09:23 -0700
commitaf3d522ffbf83826f80ab8f6d811e19e97c37384 (patch)
tree4f3d6047a2e0a30c8374f2da5e02858b0129edac /lib-src
parent37910ab2514f67d12c5b20b63ec6333c02df43c1 (diff)
parent7400048f602459209e89da4680ed9cc351ace4ee (diff)
downloademacs-af3d522ffbf83826f80ab8f6d811e19e97c37384.tar.gz
emacs-af3d522ffbf83826f80ab8f6d811e19e97c37384.zip
Merge from trunk.
Diffstat (limited to 'lib-src')
-rw-r--r--lib-src/etags.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/lib-src/etags.c b/lib-src/etags.c
index a2cdf26abc7..097f6842c07 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -93,8 +93,11 @@ char pot_etags_version[] = "@(#) pot revision number is 17.38.1.4";
93 93
94#ifdef HAVE_CONFIG_H 94#ifdef HAVE_CONFIG_H
95# include <config.h> 95# include <config.h>
96 /* On some systems, Emacs defines static as nothing for the sake 96 /* This is probably not necessary any more. On some systems, config.h
97 of unexec. We don't want that here since we don't use unexec. */ 97 used to define static as nothing for the sake of unexec. We don't
98 want that here since we don't use unexec. None of these systems
99 are supported any more, but the idea is still mentioned in
100 etc/PROBLEMS. */
98# undef static 101# undef static
99# ifndef PTR /* for XEmacs */ 102# ifndef PTR /* for XEmacs */
100# define PTR void * 103# define PTR void *