1
0
mirror of https://github.com/samba-team/samba.git synced 2025-10-29 04:23:51 +03:00

r7139: trying to reduce the number of diffs between trunk and 3.0; changing version to 3.0.20pre1

(This used to be commit 9727d05241)
This commit is contained in:
Gerald Carter
2005-05-31 13:46:45 +00:00
committed by Gerald (Jerry) Carter
parent 450e8d5749
commit f24d88cf9d
39 changed files with 1327 additions and 4911 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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}
};