summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorTim Prouty <tprouty@samba.org>2008-12-30 13:45:29 -0800
committerTim Prouty <tprouty@samba.org>2009-01-05 22:40:04 -0800
commited5e1e5bd6c968eb98058d5a097ab36ac456141e (patch)
treea537308c2b694502b10e0a3fc8f63a4d1fa9224b /.gitignore
parent958bfaff7908509dc0c171e080e5767453dea4a3 (diff)
downloadsamba-ed5e1e5bd6c968eb98058d5a097ab36ac456141e.tar.gz
samba-ed5e1e5bd6c968eb98058d5a097ab36ac456141e.tar.bz2
samba-ed5e1e5bd6c968eb98058d5a097ab36ac456141e.zip
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.
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 1 insertions, 1 deletions
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*