diff options
| author | Tim Potter <tpot@samba.org> | 2002-07-29 23:50:54 +0000 |
|---|---|---|
| committer | Tim Potter <tpot@samba.org> | 2002-07-29 23:50:54 +0000 |
| commit | 362f534fa1152e9fc3d195bd1200b4c5d3e037e2 (patch) | |
| tree | 9c7211ed986b8c6016a1cd4d5be13cfa7d51e7d1 | |
| parent | c17dc6c55c3a5a2912028a1d6a713f26b3b91c63 (diff) | |
| download | samba-362f534fa1152e9fc3d195bd1200b4c5d3e037e2.tar.gz samba-362f534fa1152e9fc3d195bd1200b4c5d3e037e2.tar.bz2 samba-362f534fa1152e9fc3d195bd1200b4c5d3e037e2.zip | |
Our include popt is starting to get a bit old - fixed some compile
problems here.
Also fixed some non-constant initialisers in samsync.
(This used to be commit 33bd7214736dafd5927d63af5f8510646b81e7df)
| -rw-r--r-- | source3/lib/popt_common.c | 2 | ||||
| -rw-r--r-- | source3/rpcclient/samsync.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source3/lib/popt_common.c b/source3/lib/popt_common.c index 288cd41b27..a3d6af4fbc 100644 --- a/source3/lib/popt_common.c +++ b/source3/lib/popt_common.c @@ -45,5 +45,5 @@ struct poptOption popt_common_debug[] = { { NULL, 0, POPT_ARG_CALLBACK, debug_callback }, { "debuglevel", 'd', POPT_ARG_INT, NULL, 'd', "Set debug level", "DEBUGLEVEL" }, - POPT_TABLEEND + { 0 } }; diff --git a/source3/rpcclient/samsync.c b/source3/rpcclient/samsync.c index 938a843d15..3694eb47df 100644 --- a/source3/rpcclient/samsync.c +++ b/source3/rpcclient/samsync.c @@ -594,7 +594,7 @@ struct poptOption popt_common_auth_info[] = { "[DOMAIN\\]username[%password]" }, { "domain", 'W', POPT_ARG_STRING, NULL, 'W', "Set domain name", "DOMAIN"}, - POPT_TABLEEND + { 0 } }; static BOOL popt_interactive; @@ -607,7 +607,7 @@ BOOL popt_common_is_interactive(void) struct poptOption popt_common_interactive[] = { { "interactive", 'i', POPT_ARG_NONE, &popt_interactive, 'i', "Log to stdout" }, - POPT_TABLEEND + { 0 } }; int main(int argc, char **argv) @@ -634,7 +634,7 @@ struct poptOption popt_common_interactive[] = { { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_auth_info }, { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_interactive }, POPT_AUTOHELP - POPT_TABLEEND + { 0 } }; /* Read command line options */ |