diff options
| author | Andrew Tridgell <tridge@samba.org> | 2006-09-23 04:36:30 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:20:15 -0500 |
| commit | 088c24e4e6e72568d4362ac39dc5ff7734782197 (patch) | |
| tree | 6656169c3c0a5d6f5cfb59828f6d9b11c99b0ac7 /source4/lib/ldb/tools/cmdline.c | |
| parent | d461f97a4acc36f9b98240cc6ce7e87a98fdd7cd (diff) | |
| download | samba-088c24e4e6e72568d4362ac39dc5ff7734782197.tar.gz samba-088c24e4e6e72568d4362ac39dc5ff7734782197.tar.bz2 samba-088c24e4e6e72568d4362ac39dc5ff7734782197.zip | |
r18840: make these compatible with g++ warnings
(This used to be commit bcfa93954fdb00f500f174cd227e3d9b2ef94fdc)
Diffstat (limited to 'source4/lib/ldb/tools/cmdline.c')
| -rw-r--r-- | source4/lib/ldb/tools/cmdline.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source4/lib/ldb/tools/cmdline.c b/source4/lib/ldb/tools/cmdline.c index 77cdcf4db8..cb811452b8 100644 --- a/source4/lib/ldb/tools/cmdline.c +++ b/source4/lib/ldb/tools/cmdline.c @@ -26,7 +26,7 @@ #include "ldb/include/includes.h" #include "ldb/tools/cmdline.h" -#ifdef _SAMBA_BUILD_ +#if (_SAMBA_BUILD_ >= 4) #include "lib/cmdline/popt_common.h" #include "lib/ldb/samba/ldif_handlers.h" #include "auth/auth.h" @@ -44,7 +44,7 @@ struct ldb_cmdline *ldb_cmdline_process(struct ldb_context *ldb, int argc, const static struct ldb_cmdline options; /* needs to be static for older compilers */ struct ldb_cmdline *ret=NULL; poptContext pc; -#ifdef _SAMBA_BUILD_ +#if (_SAMBA_BUILD_ >= 4) int r; #endif int num_options = 0; @@ -70,7 +70,7 @@ struct ldb_cmdline *ldb_cmdline_process(struct ldb_context *ldb, int argc, const { "output", 'O', POPT_ARG_STRING, &options.output, 0, "Output File", "Output" }, { NULL, 'o', POPT_ARG_STRING, NULL, 'o', "ldb_connect option", "OPTION" }, { "controls", 0, POPT_ARG_STRING, NULL, 'c', "controls", NULL }, -#ifdef _SAMBA_BUILD_ +#if (_SAMBA_BUILD_ >= 4) POPT_COMMON_SAMBA POPT_COMMON_CREDENTIALS POPT_COMMON_VERSION @@ -80,7 +80,7 @@ struct ldb_cmdline *ldb_cmdline_process(struct ldb_context *ldb, int argc, const ldb_global_init(); -#ifdef _SAMBA_BUILD_ +#if (_SAMBA_BUILD_ >= 4) r = ldb_register_samba_handlers(ldb); if (r != 0) { goto failed; @@ -206,7 +206,7 @@ struct ldb_cmdline *ldb_cmdline_process(struct ldb_context *ldb, int argc, const flags |= LDB_FLG_NOSYNC; } -#ifdef _SAMBA_BUILD_ +#if (_SAMBA_BUILD_ >= 4) /* Must be after we have processed command line options */ gensec_init(); |