svn commit: samba r6828 - in branches/SAMBA_4_0/source: build/smb_build lib/talloc

[jelmer at samba.org]

Author: jelmer
Date: 2005-05-16 21:08:44 +0000 (Mon, 16 May 2005)
New Revision: 6828

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

Log:
More portability fixes

Modified:
   branches/SAMBA_4_0/source/build/smb_build/makefile.pm
   branches/SAMBA_4_0/source/lib/talloc/Makefile.in
   branches/SAMBA_4_0/source/lib/talloc/configure.in
   branches/SAMBA_4_0/source/lib/talloc/talloc.c


Changeset:
Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/makefile.pm	2005-05-16 19:55:51 UTC (rev 6827)
+++ branches/SAMBA_4_0/source/build/smb_build/makefile.pm	2005-05-16 21:08:44 UTC (rev 6828)
@@ -85,7 +85,7 @@
 
 	$output = << '__EOD__';
 CC=@CC@
-CC_FLAGS=-Iinclude -I. -I$(srcdir)/include -I$(srcdir) -D_SAMBA_BUILD_ -Ilib @CFLAGS@ @CPPFLAGS@
+CC_FLAGS=-Iinclude -I. -I$(srcdir)/include -I$(srcdir) -D_SAMBA_BUILD_ -DHAVE_CONFIG_H -Ilib @CFLAGS@ @CPPFLAGS@
 
 LD=@CC@
 LD_FLAGS=@LDFLAGS@ @CFLAGS@

Modified: branches/SAMBA_4_0/source/lib/talloc/Makefile.in
===================================================================
--- branches/SAMBA_4_0/source/lib/talloc/Makefile.in	2005-05-16 19:55:51 UTC (rev 6827)
+++ branches/SAMBA_4_0/source/lib/talloc/Makefile.in	2005-05-16 21:08:44 UTC (rev 6828)
@@ -6,7 +6,7 @@
 XSLTPROC = @XSLTPROC@
 INSTALLCMD = @INSTALL@
 CC = @CC@
-CFLAGS=@CFLAGS@
+CFLAGS = @CFLAGS@ -DHAVE_CONFIG_H=
 
 LIBOBJ = talloc.o
 

Modified: branches/SAMBA_4_0/source/lib/talloc/configure.in
===================================================================
--- branches/SAMBA_4_0/source/lib/talloc/configure.in	2005-05-16 19:55:51 UTC (rev 6827)
+++ branches/SAMBA_4_0/source/lib/talloc/configure.in	2005-05-16 21:08:44 UTC (rev 6828)
@@ -6,7 +6,7 @@
 fi
 AC_PROG_INSTALL
 AC_PATH_PROG(XSLTPROC,xsltproc)
-AC_CHECK_HEADERS(stdint.h stdarg.h)
+AC_CHECK_HEADERS(stdint.h stdarg.h unistd.h sys/types.h)
 AC_CONFIG_HEADER(config.h)
 sinclude(config.m4)
 AC_OUTPUT(Makefile talloc.pc)

Modified: branches/SAMBA_4_0/source/lib/talloc/talloc.c
===================================================================
--- branches/SAMBA_4_0/source/lib/talloc/talloc.c	2005-05-16 19:55:51 UTC (rev 6827)
+++ branches/SAMBA_4_0/source/lib/talloc/talloc.c	2005-05-16 21:08:44 UTC (rev 6828)
@@ -27,12 +27,21 @@
 */
 
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 
 #ifdef HAVE_STDARG_H
 #include <stdarg.h>