X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=libcfs%2Fautoconf%2Flustre-libcfs.m4;h=acbe4a71394c49c1bc2e87054a6d67ed0a2d7283;hb=cd09f5d6b99545414f393aa36f1cdf627a257811;hp=a78f4087a916b5d172e8144bbb59e0864cffc3be;hpb=426fe0cbaffab4547cd20726d766b099e5f3b53e;p=fs%2Flustre-release.git

diff --git a/libcfs/autoconf/lustre-libcfs.m4 b/libcfs/autoconf/lustre-libcfs.m4
index a78f408..acbe4a7 100644
--- a/libcfs/autoconf/lustre-libcfs.m4
+++ b/libcfs/autoconf/lustre-libcfs.m4
@@ -176,10 +176,11 @@ tmp_flags="$CFLAGS"
 CFLAGS="$CFLAGS -Werror"
 AC_COMPILE_IFELSE([
 	#include <linux/types.h>
+	#include <linux/stddef.h>
 	int main(void) {
 		unsigned long long *data1;
-		__u64 *data2;
-		
+		__u64 *data2 = NULL;
+
 		data1 = data2;
 		return 0;
 	}
@@ -200,7 +201,7 @@ LB_LINUX_TRY_COMPILE([
 ],[
 	unsigned long long *data1;
 	__u64 *data2 = NULL;
-		
+
 	data1 = data2;
 ],[
 	AC_MSG_RESULT([yes])
@@ -219,10 +220,11 @@ tmp_flags="$CFLAGS"
 CFLAGS="$CFLAGS -Werror"
 AC_COMPILE_IFELSE([
 	#include <linux/types.h>
+	#include <linux/stddef.h>
 	int main(void) {
 		unsigned long *data1;
-		size_t *data2;
-		
+		size_t *data2 = NULL;
+
 		data1 = data2;
 		return 0;
 	}
@@ -242,10 +244,11 @@ tmp_flags="$CFLAGS"
 CFLAGS="$CFLAGS -Werror"
 AC_COMPILE_IFELSE([
 	#include <linux/types.h>
+	#include <linux/stddef.h>
 	int main(void) {
 		long *data1;
-		ssize_t *data2;
-		
+		ssize_t *data2 = NULL;
+
 		data1 = data2;
 		return 0;
 	}
@@ -531,17 +534,17 @@ AC_CHECK_FUNCS([strnlen])
 AC_CHECK_TYPE([umode_t],
 	[AC_DEFINE(HAVE_UMODE_T, 1, [umode_t is defined])],
 	[],
-	[#include <signal.h>])
+	[#include <asm/types.h>])
 
 AC_CHECK_TYPE([__u64],
 	[AC_DEFINE(HAVE___U64, 1, [__u64 is defined])],
 	[],
-	[#include <signal.h>])
+	[#include <asm/types.h>])
 
 AC_CHECK_TYPE([__s64],
 	[AC_DEFINE(HAVE___S64, 1, [__s64 is defined])],
 	[],
-	[#include <signal.h>])
+	[#include <asm/types.h>])
 
 # --------  Check for required packages  --------------
 
@@ -617,6 +620,7 @@ libcfs/include/libcfs/util/Makefile
 libcfs/libcfs/Makefile
 libcfs/libcfs/autoMakefile
 libcfs/libcfs/linux/Makefile
+libcfs/libcfs/ulinux/Makefile
 libcfs/libcfs/posix/Makefile
 libcfs/libcfs/util/Makefile
 ])