4 files changed, 11 insertions, 5 deletions
diff --git a/source3/lib/socket_wrapper.c b/source3/lib/socket_wrapper.c
index 2a26ba1534..cb3911c358 100644
--- a/source3/lib/socket_wrapper.c
+++ b/source3/lib/socket_wrapper.c
@@ -19,7 +19,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#ifdef _SAMBA_BUILD
+#ifdef _SAMBA_BUILD_
 #include "includes.h"
 #include "system/network.h"
 #else
diff --git a/source3/nsswitch/wb_common.c b/source3/nsswitch/wb_common.c
index 6ba0cbbf42..40cf534c41 100644
--- a/source3/nsswitch/wb_common.c
+++ b/source3/nsswitch/wb_common.c
@@ -26,9 +26,6 @@
 
 #include "winbind_client.h"
 
-#define CONST_DISCARD(type, ptr)      ((type) ((void *) (ptr)))
-#define CONST_ADD(type, ptr)          ((type) ((const void *) (ptr)))
-
 /* Global variables.  These are effectively the client state information */
 
 int winbindd_fd = -1;           /* fd for winbindd socket */
diff --git a/source3/nsswitch/winbind_nss_irix.c b/source3/nsswitch/winbind_nss_irix.c
index 3a9d6c01ab..26179773a9 100644
--- a/source3/nsswitch/winbind_nss_irix.c
+++ b/source3/nsswitch/winbind_nss_irix.c
@@ -122,7 +122,7 @@ winbind_startnext_timeout(nsd_file_t **rqp, nsd_times_t *to)
 }
 
 static void
-dequeue_request()
+dequeue_request(void)
 {
 	nsd_file_t *rq;
 	struct winbindd_request *request;
diff --git a/source3/nsswitch/winbindd_nss.h b/source3/nsswitch/winbindd_nss.h
index 06ebd68f8f..618ef79a0b 100644
--- a/source3/nsswitch/winbindd_nss.h
+++ b/source3/nsswitch/winbindd_nss.h
@@ -10,6 +10,15 @@
    products. You do not need to give any attribution.  
 */
 
+
+#ifndef CONST_DISCARD
+#define CONST_DISCARD(type, ptr)      ((type) ((void *) (ptr)))
+#endif
+
+#ifndef CONST_ADD
+#define CONST_ADD(type, ptr)          ((type) ((const void *) (ptr)))
+#endif
+
 #ifndef SAFE_FREE
 #define SAFE_FREE(x) do { if(x) {free(CONST_DISCARD(void *, (x))); x=NULL;} } while(0)
 #endif