From 9727d05241574042dd3aa8844ae5c701d22e2da1 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Tue, 31 May 2005 13:46:45 +0000 Subject: r7139: trying to reduce the number of diffs between trunk and 3.0; changing version to 3.0.20pre1 --- source/modules/getdate.c | 9 +++++---- source/modules/getdate.y | 9 +++++---- source/modules/weird.c | 4 ++-- 3 files changed, 12 insertions(+), 10 deletions(-) (limited to 'source/modules') diff --git a/source/modules/getdate.c b/source/modules/getdate.c index 2ce07f898ca..491c51294e9 100644 --- a/source/modules/getdate.c +++ b/source/modules/getdate.c @@ -120,10 +120,11 @@ the right thing about local DST. Unlike previous versions, this version is reentrant. */ -#include - -#ifdef HAVE_ALLOCA_H -# include +#ifdef HAVE_CONFIG_H +# include +# ifdef HAVE_ALLOCA_H +# include +# endif #endif /* Since the code of getdate.y is not included in the Emacs executable diff --git a/source/modules/getdate.y b/source/modules/getdate.y index ecae7311ac8..aab37f4d235 100644 --- a/source/modules/getdate.y +++ b/source/modules/getdate.y @@ -25,10 +25,11 @@ the right thing about local DST. Unlike previous versions, this version is reentrant. */ -#include - -#ifdef HAVE_ALLOCA_H -# include +#ifdef HAVE_CONFIG_H +# include +# ifdef HAVE_ALLOCA_H +# include +# endif #endif /* Since the code of getdate.y is not included in the Emacs executable diff --git a/source/modules/weird.c b/source/modules/weird.c index e4809a64c42..3c59fd9d61f 100644 --- a/source/modules/weird.c +++ b/source/modules/weird.c @@ -26,8 +26,8 @@ static struct { char *to; int len; } weird_table[] = { - {'q', CONST_DISCARD(char *, "^q^"), 3}, - {'Q', CONST_DISCARD(char *, "^Q^"), 3}, + {'q', "^q^", 3}, + {'Q', "^Q^", 3}, {0, NULL} }; -- cgit