[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-278-ge6777e5

Jeremy Allison jra at samba.org
Wed Mar 11 19:14:27 GMT 2009


The branch, master has been updated
       via  e6777e5266d03dedea42d31767f8ee6b907d9b53 (commit)
      from  41c5d70c8d7b2af4fab50215f9bfea8e910cf99f (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit e6777e5266d03dedea42d31767f8ee6b907d9b53
Author: Björn Jacke <bj at sernet.de>
Date:   Wed Mar 11 08:24:18 2009 +0100

    fix configure check by avoiding main(main(...))
    
    AC_TRY_LINK automatically wraps a main(). Double main() causes this test to fail
    on some compilers.

-----------------------------------------------------------------------

Summary of changes:
 source3/configure.in |   11 ++++-------
 1 files changed, 4 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/configure.in b/source3/configure.in
index 2af1545..ab5e81f 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -1177,13 +1177,10 @@ if test x"$LIBUNWIND_PTRACE" != x"" ; then
 #endif
 	    ],
 	    [
-		int main(int argc, const char ** argv)
-		{
-			pid_t me = (pid_t)-1;
-			ptrace(PTRACE_ATTACH, me, 0, 0);
-			ptrace(PTRACE_DETACH, me, 0, 0);
-			return 0;
-		}
+		pid_t me = (pid_t)-1;
+		ptrace(PTRACE_ATTACH, me, 0, 0);
+		ptrace(PTRACE_DETACH, me, 0, 0);
+		return 0;
 	    ],
 	    [
 		AC_MSG_RESULT(yes)


-- 
Samba Shared Repository


More information about the samba-cvs mailing list