diff options
Diffstat (limited to 'source3/modules')
| -rw-r--r-- | source3/modules/getdate.c | 9 | ||||
| -rw-r--r-- | source3/modules/getdate.y | 9 | ||||
| -rw-r--r-- | source3/modules/weird.c | 4 |
3 files changed, 10 insertions, 12 deletions
diff --git a/source3/modules/getdate.c b/source3/modules/getdate.c index 491c51294e..2ce07f898c 100644 --- a/source3/modules/getdate.c +++ b/source3/modules/getdate.c @@ -120,11 +120,10 @@ the right thing about local DST. Unlike previous versions, this version is reentrant. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -# ifdef HAVE_ALLOCA_H -# include <alloca.h> -# endif +#include <config.h> + +#ifdef HAVE_ALLOCA_H +# include <alloca.h> #endif /* Since the code of getdate.y is not included in the Emacs executable diff --git a/source3/modules/getdate.y b/source3/modules/getdate.y index aab37f4d23..ecae7311ac 100644 --- a/source3/modules/getdate.y +++ b/source3/modules/getdate.y @@ -25,11 +25,10 @@ the right thing about local DST. Unlike previous versions, this version is reentrant. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -# ifdef HAVE_ALLOCA_H -# include <alloca.h> -# endif +#include <config.h> + +#ifdef HAVE_ALLOCA_H +# include <alloca.h> #endif /* Since the code of getdate.y is not included in the Emacs executable diff --git a/source3/modules/weird.c b/source3/modules/weird.c index 3c59fd9d61..e4809a64c4 100644 --- a/source3/modules/weird.c +++ b/source3/modules/weird.c @@ -26,8 +26,8 @@ static struct { char *to; int len; } weird_table[] = { - {'q', "^q^", 3}, - {'Q', "^Q^", 3}, + {'q', CONST_DISCARD(char *, "^q^"), 3}, + {'Q', CONST_DISCARD(char *, "^Q^"), 3}, {0, NULL} }; |