From ed5e1e5bd6c968eb98058d5a097ab36ac456141e Mon Sep 17 00:00:00 2001 From: Tim Prouty Date: Tue, 30 Dec 2008 13:45:29 -0800 Subject: s3 merged build: Remove redundant #defines that are in idl generated headers This fixes a series of samba3 build warnings in the merged build with --enable-picky-developer=yes. 'error: "X" redefined', where X is one of the redundant #defines. This required committing a static version of spoolss.h for it to be included by non-merged s3 builds. --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index 773165afb5..dae5f063c3 100644 --- a/.gitignore +++ b/.gitignore @@ -318,7 +318,7 @@ librpc/gen_ndr/*wzcsvc* librpc/gen_ndr/*w32time* librpc/gen_ndr/*wmi* librpc/gen_ndr/*trkwks* -librpc/gen_ndr/*spoolss* +librpc/gen_ndr/*_spoolss* librpc/gen_ndr/*rot* librpc/gen_ndr/*remact* librpc/gen_ndr/*oxidresolver* -- cgit