diff options
author | Matt Kraai <mkraai@beckman.com> | 2009-08-26 14:50:28 -0700 |
---|---|---|
committer | Günther Deschner <gd@samba.org> | 2009-09-02 13:02:39 +0200 |
commit | 6657598168724d4fe076f9014c2b5c16a034fe52 (patch) | |
tree | 95c7f44c4796db93a36740244e164590e6d08e8e | |
parent | f092d689c577293d011912be5ded5ebf8aa49fc9 (diff) | |
download | samba-6657598168724d4fe076f9014c2b5c16a034fe52.tar.gz samba-6657598168724d4fe076f9014c2b5c16a034fe52.tar.bz2 samba-6657598168724d4fe076f9014c2b5c16a034fe52.zip |
Do not redefine strupr
Signed-off-by: Günther Deschner <gd@samba.org>
-rw-r--r-- | source3/configure.in | 1 | ||||
-rw-r--r-- | source3/libaddns/dnsgss.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/source3/configure.in b/source3/configure.in index 34e923dd50..325575148e 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -1016,6 +1016,7 @@ AC_CHECK_HEADERS(sys/mman.h) AC_CHECK_FUNCS(shmget shm_open) AC_CHECK_FUNCS(gettext dgettext) AC_CHECK_FUNCS(bindtextdomain textdomain) +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 e7ea041847..1e3d4645ba 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 /********************************************************************* |