diff options
| author | Andrew Tridgell <tridge@samba.org> | 2004-11-05 07:23:06 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:05:30 -0500 |
| commit | e8010adffe44f1ad0d82c7b5c7d5fe2cf7d53afd (patch) | |
| tree | 0f4653e688ab9ea6bb03ffa62269e990ffff3cd0 | |
| parent | ba8b9d49cd6b72a31673a189214d979248a30a6b (diff) | |
| download | samba-e8010adffe44f1ad0d82c7b5c7d5fe2cf7d53afd.tar.gz samba-e8010adffe44f1ad0d82c7b5c7d5fe2cf7d53afd.tar.bz2 samba-e8010adffe44f1ad0d82c7b5c7d5fe2cf7d53afd.zip | |
r3543: fixed some #include lines to make them more consistent, and fixed
conditional compilation of xattr client code
(This used to be commit 321fb06a627f4deae649ab014bc881721d37b3dd)
| -rw-r--r-- | source4/lib/registry/tools/regpatch.c | 2 | ||||
| -rw-r--r-- | source4/param/loadparm.c | 2 | ||||
| -rw-r--r-- | source4/utils/getntacl.c | 2 | ||||
| -rw-r--r-- | source4/utils/setntacl.c | 2 | ||||
| -rw-r--r-- | source4/utils/setnttoken.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/source4/lib/registry/tools/regpatch.c b/source4/lib/registry/tools/regpatch.c index 38eabb60a9..4ad7e162a3 100644 --- a/source4/lib/registry/tools/regpatch.c +++ b/source4/lib/registry/tools/regpatch.c @@ -59,7 +59,7 @@ #define CMD_KEY 1 #define CMD_VAL 2 -#include <include/includes.h> +#include "includes.h" typedef struct val_spec_list { struct val_spec_list *next; diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c index c535509ca6..bbdf835e95 100644 --- a/source4/param/loadparm.c +++ b/source4/param/loadparm.c @@ -59,7 +59,7 @@ #include "system/network.h" #include "system/printing.h" #include "librpc/gen_ndr/ndr_svcctl.h" -#include "include/dlinklist.h" +#include "dlinklist.h" BOOL in_client = False; /* Not in the client by default */ static BOOL bLoaded = False; diff --git a/source4/utils/getntacl.c b/source4/utils/getntacl.c index 0d6e86bf3b..2a35c93387 100644 --- a/source4/utils/getntacl.c +++ b/source4/utils/getntacl.c @@ -22,7 +22,7 @@ #include "includes.h" -#ifdef HAVE_NO_ACLS +#if (!defined(HAVE_NO_ACLS) || !defined(HAVE_XATTR_SUPPORT)) int main(int argc, char **argv) { diff --git a/source4/utils/setntacl.c b/source4/utils/setntacl.c index 2ac6e6d6f3..a65a014f26 100644 --- a/source4/utils/setntacl.c +++ b/source4/utils/setntacl.c @@ -22,7 +22,7 @@ #include "includes.h" -#ifdef HAVE_NO_ACLS +#if (!defined(HAVE_NO_ACLS) || !defined(HAVE_XATTR_SUPPORT)) int main(int argc, char **argv) { diff --git a/source4/utils/setnttoken.c b/source4/utils/setnttoken.c index e3f699fce4..b3b11a78ca 100644 --- a/source4/utils/setnttoken.c +++ b/source4/utils/setnttoken.c @@ -22,7 +22,7 @@ #include "includes.h" -#ifdef HAVE_NO_ACLS +#if (!defined(HAVE_NO_ACLS) || !defined(HAVE_XATTR_SUPPORT)) int main(int argc, char **argv) { |