diff options
| author | Gerald Carter <jerry@samba.org> | 2005-05-31 13:46:45 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:57:02 -0500 |
| commit | f24d88cf9da46680d52b42b92bd484e7b09ce99b (patch) | |
| tree | b30342fd7677a0d17306130077995110bfae344a /source3/modules | |
| parent | 450e8d5749504f8392c0cfe8b79218f03b88076a (diff) | |
| download | samba-f24d88cf9da46680d52b42b92bd484e7b09ce99b.tar.gz samba-f24d88cf9da46680d52b42b92bd484e7b09ce99b.tar.bz2 samba-f24d88cf9da46680d52b42b92bd484e7b09ce99b.zip | |
r7139: trying to reduce the number of diffs between trunk and 3.0; changing version to 3.0.20pre1
(This used to be commit 9727d05241574042dd3aa8844ae5c701d22e2da1)
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, 12 insertions, 10 deletions
diff --git a/source3/modules/getdate.c b/source3/modules/getdate.c index 2ce07f898c..491c51294e 100644 --- a/source3/modules/getdate.c +++ b/source3/modules/getdate.c @@ -120,10 +120,11 @@ the right thing about local DST. Unlike previous versions, this version is reentrant. */ -#include <config.h> - -#ifdef HAVE_ALLOCA_H -# include <alloca.h> +#ifdef HAVE_CONFIG_H +# include <config.h> +# ifdef HAVE_ALLOCA_H +# include <alloca.h> +# endif #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 ecae7311ac..aab37f4d23 100644 --- a/source3/modules/getdate.y +++ b/source3/modules/getdate.y @@ -25,10 +25,11 @@ the right thing about local DST. Unlike previous versions, this version is reentrant. */ -#include <config.h> - -#ifdef HAVE_ALLOCA_H -# include <alloca.h> +#ifdef HAVE_CONFIG_H +# include <config.h> +# ifdef HAVE_ALLOCA_H +# include <alloca.h> +# endif #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 e4809a64c4..3c59fd9d61 100644 --- a/source3/modules/weird.c +++ b/source3/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} }; |