The branch, master has been updated
via 0429471 lib/ccan: Fix some typos in libccan.m4
via fef4f51 lib/ccan: fix m4 tests for builtin_expect and compound
literals.
from fdcbb7e s3-includes: remove PRIMARY_* SID_INDEX defines defined
elsewhere already.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 0429471fe478b86a9857511a7b841601640c8bac
Author: Martin Schwenke <mar...@meltin.net>
Date: Thu Dec 15 15:31:47 2011 +1100
lib/ccan: Fix some typos in libccan.m4
Signed-off-by: Martin Schwenke <mar...@meltin.net>
Autobuild-User: Rusty Russell <ru...@rustcorp.com.au>
Autobuild-Date: Thu Dec 15 07:40:33 CET 2011 on sn-devel-104
commit fef4f5193b68598c99949ee2fbd9bee93daf70b1
Author: Rusty Russell <ru...@rustcorp.com.au>
Date: Thu Dec 15 15:34:55 2011 +1030
lib/ccan: fix m4 tests for builtin_expect and compound literals.
Signed-off-by: Rusty Russell <ru...@rustcorp.com.au>
-----------------------------------------------------------------------
Summary of changes:
lib/ccan/libccan.m4 | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/ccan/libccan.m4 b/lib/ccan/libccan.m4
index 7dbea58..1efa0f0 100644
--- a/lib/ccan/libccan.m4
+++ b/lib/ccan/libccan.m4
@@ -196,7 +196,7 @@ AC_CACHE_CHECK([whether we have __builtin_expect],
[
AC_LINK_IFELSE(
[int main(void) {
- return __builtin_expect(main != 0) ? 0 : 1;
+ return __builtin_expect(main != 0, 1) ? 0 : 1;
}],
samba_cv_builtin_expect=yes)
])
@@ -236,14 +236,14 @@ if test x"$samba_cv_builtin_types_compatible_p" = xyes ;
then
[whether we have __builtin_types_compatible_p])
fi
-AC_CACHE_CHECK([whether we have __builtin_choose_exptr],
+AC_CACHE_CHECK([whether we have __builtin_choose_expr],
samba_cv_builtin_choose_expr,
[
AC_LINK_IFELSE(
[int main(void) {
return __builtin_choose_expr(1, 0, "garbage");
}],
- samba_cv_builtin_types_choose_expr=yes)
+ samba_cv_builtin_choose_expr=yes)
])
if test x"$samba_cv_builtin_choose_expr" = xyes ; then
@@ -251,20 +251,21 @@ if test x"$samba_cv_builtin_choose_expr" = xyes ; then
[whether we have __builtin_choose_expr])
fi
-AC_CACHE_CHECK([whether we have __builtin_compound_literals],
- samba_cv_builtin_compound_literals,
+# We use @<:@ and @:>@ here for embedded [ and ].
+AC_CACHE_CHECK([whether we have compound literals],
+ samba_cv_compound_literals,
[
AC_COMPILE_IFELSE(
[int main(void) {
- int *foo = (int[]) { 1, 2, 3, 4 };
- return foo[0] == 1 ? 0 : 1;
+ int *foo = (int@<:@@:>@) { 1, 2, 3, 4 };
+ return foo@<:@0@:>@ == 1 ? 0 : 1;
}],
- samba_cv_builtin_compound_literals=yes)
+ samba_cv_compound_literals=yes)
])
-if test x"$samba_cv_builtin_compound_literals" = xyes ; then
- AC_DEFINE(HAVE_BUILTIN_COMPOUND_LITERALS, 1,
- [whether we have __builtin_compound_literals])
+if test x"$samba_cv_compound_literals" = xyes ; then
+ AC_DEFINE(HAVE_COMPOUND_LITERALS, 1,
+ [whether we have compound literals])
fi
AC_CACHE_CHECK([whether we have __builtin_have_isblank],
--
Samba Shared Repository
