[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  a052aa8... s3-printing: explicitly include "printing/pcap.h" as there is /usr/include/pcap.h.
      from  bd6d76d... lib/util: fix waf configure tests for xattr functions on Mac OS 10.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit a052aa87be3ac8fa6167ade27f756dd44f5fc2c3
Author: Günther Deschner <gd at samba.org>
Date:   Fri May 14 14:39:40 2010 +0200

    s3-printing: explicitly include "printing/pcap.h" as there is /usr/include/pcap.h.
    
    Thanks metze for pointing this out. Simo, please check.
    
    Guenther

-----------------------------------------------------------------------

Summary of changes:
 source3/printing/load.c           |    2 +-
 source3/printing/pcap.c           |    2 +-
 source3/printing/print_aix.c      |    2 +-
 source3/printing/print_cups.c     |    2 +-
 source3/printing/print_iprint.c   |    2 +-
 source3/printing/print_standard.c |    2 +-
 source3/printing/print_svid.c     |    2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/printing/load.c b/source3/printing/load.c
index d440a22..99b5226 100644
--- a/source3/printing/load.c
+++ b/source3/printing/load.c
@@ -18,7 +18,7 @@
 */
 
 #include "includes.h"
-#include "pcap.h"
+#include "printing/pcap.h"
 
 
 /***************************************************************************
diff --git a/source3/printing/pcap.c b/source3/printing/pcap.c
index 2b1ab63..f5502be 100644
--- a/source3/printing/pcap.c
+++ b/source3/printing/pcap.c
@@ -37,7 +37,7 @@
  */
 
 #include "includes.h"
-#include "pcap.h"
+#include "printing/pcap.h"
 
 struct pcap_cache {
 	char *name;
diff --git a/source3/printing/print_aix.c b/source3/printing/print_aix.c
index dbdfbc7..1b23610 100644
--- a/source3/printing/print_aix.c
+++ b/source3/printing/print_aix.c
@@ -25,7 +25,7 @@
  */
 
 #include "includes.h"
-#include "pcap.h"
+#include "printing/pcap.h"
 
 #ifdef AIX
 bool aix_cache_reload(void)
diff --git a/source3/printing/print_cups.c b/source3/printing/print_cups.c
index 1db0518..7366f85 100644
--- a/source3/printing/print_cups.c
+++ b/source3/printing/print_cups.c
@@ -24,7 +24,7 @@
 
 #include "includes.h"
 #include "printing.h"
-#include "pcap.h"
+#include "printing/pcap.h"
 
 #ifdef HAVE_CUPS
 #include <cups/cups.h>
diff --git a/source3/printing/print_iprint.c b/source3/printing/print_iprint.c
index 4f483d9..f7a86dd 100644
--- a/source3/printing/print_iprint.c
+++ b/source3/printing/print_iprint.c
@@ -21,7 +21,7 @@
 
 #include "includes.h"
 #include "printing.h"
-#include "pcap.h"
+#include "printing/pcap.h"
 
 #ifdef HAVE_IPRINT
 #include <cups/cups.h>
diff --git a/source3/printing/print_standard.c b/source3/printing/print_standard.c
index 9945699..e387773 100644
--- a/source3/printing/print_standard.c
+++ b/source3/printing/print_standard.c
@@ -55,7 +55,7 @@
 
 
 #include "includes.h"
-#include "pcap.h"
+#include "printing/pcap.h"
 
 /* handle standard printcap - moved from pcap_printer_fn() */
 bool std_pcap_cache_reload(const char *pcap_name)
diff --git a/source3/printing/print_svid.c b/source3/printing/print_svid.c
index 4d4e92e..4929be1 100644
--- a/source3/printing/print_svid.c
+++ b/source3/printing/print_svid.c
@@ -32,7 +32,7 @@
 
 
 #include "includes.h"
-#include "pcap.h"
+#include "printing/pcap.h"
 
 #if defined(SYSV) || defined(HPUX)
 bool sysv_cache_reload(void)


-- 
Samba Shared Repository