summaryrefslogtreecommitdiff
path: root/source4/lib/ldb
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2006-09-10 11:16:09 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:18:09 -0500
commitf658414c5f6a0a92e4ceddf2f094a0216e460ab5 (patch)
tree75e43c601faaa9347e601aadb5533599d0628eaf /source4/lib/ldb
parent354bf04db976889d68aadddc27823d848e27b894 (diff)
downloadsamba-f658414c5f6a0a92e4ceddf2f094a0216e460ab5.tar.gz
samba-f658414c5f6a0a92e4ceddf2f094a0216e460ab5.tar.bz2
samba-f658414c5f6a0a92e4ceddf2f094a0216e460ab5.zip
r18327: 'struct token' is defined on some hosts
(This used to be commit b2bba4e7261e4daf2be44110c454eb0e217836ca)
Diffstat (limited to 'source4/lib/ldb')
-rw-r--r--source4/lib/ldb/tools/oLschema2ldif.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/source4/lib/ldb/tools/oLschema2ldif.c b/source4/lib/ldb/tools/oLschema2ldif.c
index f734e99683..a9e157e323 100644
--- a/source4/lib/ldb/tools/oLschema2ldif.c
+++ b/source4/lib/ldb/tools/oLschema2ldif.c
@@ -57,7 +57,7 @@ struct schema_conv {
int failures;
};
-struct token {
+struct schema_token {
int type;
char *value;
};
@@ -135,14 +135,14 @@ static char *get_def_value(TALLOC_CTX *ctx, char **string)
return value;
}
-static struct token *get_next_schema_token(TALLOC_CTX *ctx, char **string)
+static struct schema_token *get_next_schema_token(TALLOC_CTX *ctx, char **string)
{
char *c = skip_spaces(*string);
char *type;
- struct token *token;
+ struct schema_token *token;
int n;
- token = talloc(ctx, struct token);
+ token = talloc(ctx, struct schema_token);
n = strcspn(c, " \t\n");
type = talloc_strndup(token, c, n);
@@ -333,7 +333,7 @@ static struct ldb_message *process_entry(TALLOC_CTX *mem_ctx, const char *entry)
{
TALLOC_CTX *ctx;
struct ldb_message *msg;
- struct token *token;
+ struct schema_token *token;
char *c, *s;
int n;