diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2005-06-04 13:57:52 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:17:35 -0500 |
commit | 5296bd1b5107f321de0dc9b3a9c3f6ac5a4861f0 (patch) | |
tree | a5464cdee1f79ca2fdb77c2cb1915d034134aaf9 /source4/build | |
parent | 03cdfbe8ac68621d1dfa53164d095eb451793bc0 (diff) | |
download | samba-5296bd1b5107f321de0dc9b3a9c3f6ac5a4861f0.tar.gz samba-5296bd1b5107f321de0dc9b3a9c3f6ac5a4861f0.tar.bz2 samba-5296bd1b5107f321de0dc9b3a9c3f6ac5a4861f0.zip |
r7274: Move m4 files to seperate dir
(This used to be commit 0dda66f0e8e6ad37d731937af184a132bf3407b1)
Diffstat (limited to 'source4/build')
-rw-r--r-- | source4/build/m4/check_cc.m4 (renamed from source4/build/smb_build/check_cc.m4) | 0 | ||||
-rw-r--r-- | source4/build/m4/check_ld.m4 (renamed from source4/build/smb_build/check_ld.m4) | 0 | ||||
-rw-r--r-- | source4/build/m4/check_path.m4 (renamed from source4/build/smb_build/check_path.m4) | 0 | ||||
-rw-r--r-- | source4/build/m4/check_perl.m4 (renamed from source4/build/smb_build/check_perl.m4) | 0 | ||||
-rw-r--r-- | source4/build/m4/check_shld.m4 (renamed from source4/build/smb_build/check_shld.m4) | 0 | ||||
-rw-r--r-- | source4/build/m4/check_types.m4 (renamed from source4/build/smb_build/check_types.m4) | 0 | ||||
-rw-r--r-- | source4/build/m4/core.m4 (renamed from source4/build/smb_build/core.m4) | 0 | ||||
-rw-r--r-- | source4/build/m4/env.m4 (renamed from source4/build/smb_build/env.m4) | 12 | ||||
-rw-r--r-- | source4/build/m4/public.m4 (renamed from source4/build/smb_build/public.m4) | 0 | ||||
-rwxr-xr-x | source4/build/pidl/tests/ndr_refptr.pl | 17 | ||||
-rw-r--r-- | source4/build/pidl/validator.pm | 1 | ||||
-rw-r--r-- | source4/build/smb_build/README.txt | 4 |
12 files changed, 26 insertions, 8 deletions
diff --git a/source4/build/smb_build/check_cc.m4 b/source4/build/m4/check_cc.m4 index 68e938b794..68e938b794 100644 --- a/source4/build/smb_build/check_cc.m4 +++ b/source4/build/m4/check_cc.m4 diff --git a/source4/build/smb_build/check_ld.m4 b/source4/build/m4/check_ld.m4 index 79a8432d11..79a8432d11 100644 --- a/source4/build/smb_build/check_ld.m4 +++ b/source4/build/m4/check_ld.m4 diff --git a/source4/build/smb_build/check_path.m4 b/source4/build/m4/check_path.m4 index 5d3c70049d..5d3c70049d 100644 --- a/source4/build/smb_build/check_path.m4 +++ b/source4/build/m4/check_path.m4 diff --git a/source4/build/smb_build/check_perl.m4 b/source4/build/m4/check_perl.m4 index 5f5f614f84..5f5f614f84 100644 --- a/source4/build/smb_build/check_perl.m4 +++ b/source4/build/m4/check_perl.m4 diff --git a/source4/build/smb_build/check_shld.m4 b/source4/build/m4/check_shld.m4 index de43aa0298..de43aa0298 100644 --- a/source4/build/smb_build/check_shld.m4 +++ b/source4/build/m4/check_shld.m4 diff --git a/source4/build/smb_build/check_types.m4 b/source4/build/m4/check_types.m4 index b4c7b5ed1c..b4c7b5ed1c 100644 --- a/source4/build/smb_build/check_types.m4 +++ b/source4/build/m4/check_types.m4 diff --git a/source4/build/smb_build/core.m4 b/source4/build/m4/core.m4 index 215ca5195e..215ca5195e 100644 --- a/source4/build/smb_build/core.m4 +++ b/source4/build/m4/core.m4 diff --git a/source4/build/smb_build/env.m4 b/source4/build/m4/env.m4 index 87316d3d30..c272247661 100644 --- a/source4/build/smb_build/env.m4 +++ b/source4/build/m4/env.m4 @@ -15,9 +15,9 @@ fi SMB_INFO_BUILD_ENV="" -sinclude(build/smb_build/check_path.m4) -sinclude(build/smb_build/check_perl.m4) -sinclude(build/smb_build/check_cc.m4) -sinclude(build/smb_build/check_ld.m4) -sinclude(build/smb_build/check_shld.m4) -sinclude(build/smb_build/check_types.m4) +sinclude(build/m4/check_path.m4) +sinclude(build/m4/check_perl.m4) +sinclude(build/m4/check_cc.m4) +sinclude(build/m4/check_ld.m4) +sinclude(build/m4/check_shld.m4) +sinclude(build/m4/check_types.m4) diff --git a/source4/build/smb_build/public.m4 b/source4/build/m4/public.m4 index 12238bbcc8..12238bbcc8 100644 --- a/source4/build/smb_build/public.m4 +++ b/source4/build/m4/public.m4 diff --git a/source4/build/pidl/tests/ndr_refptr.pl b/source4/build/pidl/tests/ndr_refptr.pl index 8654174bfe..e8d434756e 100755 --- a/source4/build/pidl/tests/ndr_refptr.pl +++ b/source4/build/pidl/tests/ndr_refptr.pl @@ -499,3 +499,20 @@ Test::test_idl("refptr-top-push-double-fstnull", \%settings, /* Windows gives [client runtime error 0x6f4] */ '); + +Test::test_idl("ignore-ptr", \%settings, +' + [public] void echo_TestRef([in,ignore] uint16 *foo, [in] uint16 *bar); +', +' struct ndr_push *ndr = ndr_push_init(); + struct echo_TestRef r; + uint16_t v = 10; + r.in.foo = &v; + r.in.bar = &v; + + if (NT_STATUS_IS_OK(ndr_push_echo_TestRef(ndr, NDR_IN, &r))) + return 1; + + if (ndr->offset != 4) + return 2; +'); diff --git a/source4/build/pidl/validator.pm b/source4/build/pidl/validator.pm index 6b35cc31a6..6bd31db621 100644 --- a/source4/build/pidl/validator.pm +++ b/source4/build/pidl/validator.pm @@ -89,6 +89,7 @@ my %property_list = ( "ref" => ["ELEMENT"], "ptr" => ["ELEMENT"], "unique" => ["ELEMENT"], + "ignore" => ["ELEMENT"], "relative" => ["ELEMENT"], "relative_base" => ["TYPEDEF"], diff --git a/source4/build/smb_build/README.txt b/source4/build/smb_build/README.txt index 0e127882d6..44aeffdad2 100644 --- a/source4/build/smb_build/README.txt +++ b/source4/build/smb_build/README.txt @@ -31,7 +31,7 @@ BINARY: (e.g. 'smbtorture' or 'ldbedit')
a BINARY typicly has only commandline handling and basic
functionality code in it and depends on the functions of
- SUBSYSTEM's (required_subsystems/REQUIRED_SUBSYSTEMS).
+ SUBSYSTEM's (REQUIRED_SUBSYSTEMS).
LIBRARY:
a LIBRARY means a static and/or shared library,
@@ -39,7 +39,7 @@ LIBRARY: (e.g. for libldb 'libldb.so', 'libldb.so.0' 'libldb.so.0.0.1'
and libldb.a are created on linux)
a LIBRARY typicly has only glue code in it and depends on
- SUBSYSTEM's (required_subsystems/REQUIRED_SUBSYSTEMS).
+ SUBSYSTEM's (REQUIRED_SUBSYSTEMS).
File summary:
-------------
|