Author: sebor
Date: Thu Feb 23 16:46:40 2006
New Revision: 380285

URL: http://svn.apache.org/viewcvs?rev=380285&view=rev
Log:
2006-02-23  Martin Sebor  <[EMAIL PROTECTED]>

        * libc_decl.sh (memchr, wmemchr): Eliminated the use of spaces
        to prevent false negatives.
        (memchr): Made the type of the first argument a void* instead
        of char* to prevent ambiguity in the presence of C++ overloads.
        (f): Quoted a variable.

Modified:
    incubator/stdcxx/trunk/etc/config/src/libc_decl.sh

Modified: incubator/stdcxx/trunk/etc/config/src/libc_decl.sh
URL: 
http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/etc/config/src/libc_decl.sh?rev=380285&r1=380284&r2=380285&view=diff
==============================================================================
--- incubator/stdcxx/trunk/etc/config/src/libc_decl.sh (original)
+++ incubator/stdcxx/trunk/etc/config/src/libc_decl.sh Thu Feb 23 16:46:40 2006
@@ -279,12 +279,12 @@
     ;;
 
     string)
-        funs="memchr((const char*)0,0,0) memcmp memcpy memmove memset strcat 
strchr((char*)0,0) strcmp strcoll strcpy strcspn strerror strlen strncat 
strncmp strncpy strpbrk((char*)0,(char*)0) strrchr((char*)0,0) strspn 
strstr((char*)0,(char*)0) strtok strxfrm"
+        funs="memchr((void*)0,0,0) memcmp memcpy memmove memset strcat 
strchr((char*)0,0) strcmp strcoll strcpy strcspn strerror strlen strncat 
strncmp strncpy strpbrk((char*)0,(char*)0) strrchr((char*)0,0) strspn 
strstr((char*)0,(char*)0) strtok strxfrm"
         lib=c
     ;;
 
     wchar)
-        funs="btowc fgetwc fgetws fputwc fputws fwide fwprintf fwscanf getwc 
getwchar mbrlen mbrtowc mbsinit mbsrtowcs putwc putwchar swprintf swscanf 
ungetwc vfwprintf vswprintf vwprintf vwscanf wcrtomb wcscat 
wcschr((wchar_t*)0,0) wcscmp wcscoll wcscpy wcscspn wcsftime wcslen wcsncat 
wcsncmp wcsncpy wcspbrk((wchar_t*)0,(wchar_t*)0) wcsrchr((wchar_t*)0,0) 
wcsrtombs wcsspn wcsstr((wchar_t*)0,(wchar_t*)0) wcstod wcstod wcstof wcstok 
wcstol wcstold wcstoll wcstombs wcstoul wcstoull wcsxfrm wctob wctomb 
wmemchr((const wchar_t*)0,0,0) wmemcmp wmemcpy wmemmove wmemset wprintf wscanf"
+        funs="btowc fgetwc fgetws fputwc fputws fwide fwprintf fwscanf getwc 
getwchar mbrlen mbrtowc mbsinit mbsrtowcs putwc putwchar swprintf swscanf 
ungetwc vfwprintf vswprintf vwprintf vwscanf wcrtomb wcscat 
wcschr((wchar_t*)0,0) wcscmp wcscoll wcscpy wcscspn wcsftime wcslen wcsncat 
wcsncmp wcsncpy wcspbrk((wchar_t*)0,(wchar_t*)0) wcsrchr((wchar_t*)0,0) 
wcsrtombs wcsspn wcsstr((wchar_t*)0,(wchar_t*)0) wcstod wcstod wcstof wcstok 
wcstol wcstold wcstoll wcstombs wcstoul wcstoull wcsxfrm wctob wctomb 
wmemchr((wchar_t*)0,0,0) wmemcmp wmemcpy wmemmove wmemset wprintf wscanf"
         lib=c
     ;;
 
@@ -305,7 +305,7 @@
     # are not expected to be declared in <cmath> or in std
     use_libc_header=0
 
-    for f in $funs ; do
+    for f in $funs; do
 
        if [ "$function" != "" -a "$function" != "$f" ]; then
            continue
@@ -325,7 +325,7 @@
         fi
 
         # starting with acosf(), look in <math.h> rather than <cmath>
-        [ $f = acosf ] && use_libc_header=1
+        [ "$f" = acosf ] && use_libc_header=1
 
         std=""
 
@@ -351,7 +351,7 @@
 
         cxxflags="-DCHECK_DECL $CXXFLAGS $WARNFLAGS \
                  -DHDRNAME=<$hdrname> -DFUNNAME=$funname \
-                 -DFUN=$f -DTAKE_ADDR=$take_addr"
+                 -DFUN='$f' -DTAKE_ADDR=$take_addr"
 
         echo "$CXX -c $cxxflags $tmpsrc -o $tmpobj " \
              "&& $LD $tmpsrc $LDFLAGS -l$lib" >>$logfile


Reply via email to