svn commit: samba r6643 - in branches/SAMBA_3_0/source: lib nsswitch

[jerry at samba.org]

Author: jerry
Date: 2005-05-07 15:03:00 +0000 (Sat, 07 May 2005)
New Revision: 6643

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=6643

Log:
fix some build issues on IRIX;l patch from james peach
Modified:
   branches/SAMBA_3_0/source/lib/socket_wrapper.c
   branches/SAMBA_3_0/source/nsswitch/wb_common.c
   branches/SAMBA_3_0/source/nsswitch/winbind_nss_irix.c
   branches/SAMBA_3_0/source/nsswitch/winbindd_nss.h


Changeset:
Modified: branches/SAMBA_3_0/source/lib/socket_wrapper.c
===================================================================
--- branches/SAMBA_3_0/source/lib/socket_wrapper.c	2005-05-07 14:55:44 UTC (rev 6642)
+++ branches/SAMBA_3_0/source/lib/socket_wrapper.c	2005-05-07 15:03:00 UTC (rev 6643)
@@ -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

Modified: branches/SAMBA_3_0/source/nsswitch/wb_common.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/wb_common.c	2005-05-07 14:55:44 UTC (rev 6642)
+++ branches/SAMBA_3_0/source/nsswitch/wb_common.c	2005-05-07 15:03:00 UTC (rev 6643)
@@ -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 */

Modified: branches/SAMBA_3_0/source/nsswitch/winbind_nss_irix.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/winbind_nss_irix.c	2005-05-07 14:55:44 UTC (rev 6642)
+++ branches/SAMBA_3_0/source/nsswitch/winbind_nss_irix.c	2005-05-07 15:03:00 UTC (rev 6643)
@@ -122,7 +122,7 @@
 }
 
 static void
-dequeue_request()
+dequeue_request(void)
 {
 	nsd_file_t *rq;
 	struct winbindd_request *request;

Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_nss.h
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/winbindd_nss.h	2005-05-07 14:55:44 UTC (rev 6642)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_nss.h	2005-05-07 15:03:00 UTC (rev 6643)
@@ -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