From f2b82cd779790c6ca9ee5a0dee2873d25f2675a4 Mon Sep 17 00:00:00 2001 From: Matt Kraai Date: Wed, 26 Aug 2009 14:50:28 -0700 Subject: [PATCH] Do not redefine strupr MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Signed-off-by: Günther Deschner (cherry picked from commit 6657598168724d4fe076f9014c2b5c16a034fe52) --- source3/configure.in | 1 + source3/libaddns/dnsgss.c | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/source3/configure.in b/source3/configure.in index 892b836..cc8940f 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -1057,6 +1057,7 @@ AC_CHECK_HEADERS(sys/mman.h) # setbuffer, shmget, shm_open are needed for smbtorture AC_CHECK_FUNCS(shmget shm_open) AC_CHECK_FUNCS(gettext dgettext) +AC_CHECK_FUNCS(strupr) # Find a method of generating a stack trace AC_CHECK_HEADERS(execinfo.h libexc.h libunwind.h) diff --git a/source3/libaddns/dnsgss.c b/source3/libaddns/dnsgss.c index e7ea041..1e3d464 100644 --- a/source3/libaddns/dnsgss.c +++ b/source3/libaddns/dnsgss.c @@ -31,6 +31,7 @@ /********************************************************************* *********************************************************************/ +#ifndef HAVE_STRUPR static int strupr( char *szDomainName ) { if ( !szDomainName ) { @@ -42,6 +43,7 @@ static int strupr( char *szDomainName ) } return ( 0 ); } +#endif #if 0 /********************************************************************* -- 1.5.4.3