From: H.Merijn Brand <h.m.brand@xs4all.nl>
Date: Sun, 7 May 2006 14:18:45 +0000 (+0000)
Subject: Remvove code that gets undone in the next line.
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=e5a5d6fc5bfc91354849d01dab4490ad7a3e32fc;p=p5sagit%2Fp5-mst-13.2.git

Remvove code that gets undone in the next line.
Keep the documentation part.

p4raw-id: //depot/perl@28116
---

diff --git a/hints/hpux.sh b/hints/hpux.sh
index bde8904..f769e51 100644
--- a/hints/hpux.sh
+++ b/hints/hpux.sh
@@ -247,7 +247,7 @@ EOM
 	    PA-RISC*)
 		loclibpth="$loclibpth /lib/pa20_64"
 		libc='/lib/pa20_64/libc.sl' ;;
-	    IA64*) 
+	    IA64*)
 		loclibpth="$loclibpth /usr/lib/hpux64"
 		libc='/usr/lib/hpux64/libc.so' ;;
 	    esac
@@ -305,7 +305,7 @@ EOM
 	case "$archname" in
 	    PA-RISC*)
 		libc='/lib/libc.sl' ;;
-	    IA64*) 
+	    IA64*)
 		loclibpth="$loclibpth /usr/lib/hpux32"
 		libc='/usr/lib/hpux32/libc.so' ;;
 	    esac
@@ -365,7 +365,7 @@ doop_cflags=''
 
 case "$ccisgcc" in
     $define|true|[Yy])
-	
+
 	case "$optimize" in
 	    "")           optimize="-g -O" ;;
 	    *O[3456789]*) optimize=`echo "$optimize" | sed -e 's/O[3-9]/O2/'` ;;
@@ -440,7 +440,7 @@ if [ $xxOsRev -lt 1020 ]; then
     fi
 
 #case "$uselargefiles-$ccisgcc" in
-#    "$define-$define"|'-define') 
+#    "$define-$define"|'-define')
 #	cat <<EOM >&4
 #
 #*** I'm ignoring large files for this build because
@@ -504,7 +504,7 @@ EOF
 EOCBU
 
 cat >UU/uselargefiles.cbu <<'EOCBU'
-# This script UU/uselargefiles.cbu will get 'called-back' by Configure 
+# This script UU/uselargefiles.cbu will get 'called-back' by Configure
 # after it has prompted the user for whether to use large files.
 case "$uselargefiles" in
     ""|$define|true|[yY]*)
@@ -531,7 +531,7 @@ EOCBU
 
 # THREADING
 
-# This script UU/usethreads.cbu will get 'called-back' by Configure 
+# This script UU/usethreads.cbu will get 'called-back' by Configure
 # after it has prompted the user for whether to use threads.
 cat >UU/usethreads.cbu <<'EOCBU'
 case "$usethreads" in
@@ -599,7 +599,7 @@ pthread_h_first="$define"
 		    localtime_r_proto='REENTRANT_PROTO_I_TS'
 
 		    # Avoid the poisonous conflicting (and irrelevant)
-		    # prototypes of setkey(). 
+		    # prototypes of setkey ().
 		    i_crypt="$undef"
 
 		    # CMA redefines select to cma_select, and cma_select
@@ -645,26 +645,12 @@ EOM
     esac
 EOCBU
 
-# The mysterious io_xs memory corruption in 11.00 32bit seems to get
-# fixed by not using Perl's malloc.  Flip side is performance loss.
-# So we want mymalloc for all situations possible
-usemymalloc='y'
-case "$usethreads" in
-    $define|true|[yY]*) usemymalloc='n' ;;
-    *)  case "$ccisgcc" in
-           $undef|false|[nN]*)
-               case "$use64bitint" in
-                   $undef|false|[nN]*)
-                       case "$ccflags" in
-                           *-DDEBUGGING*) ;;
-                           *) usemymalloc='n' ;;
-                           esac
-                       ;;
-                   esac
-               ;;
-           esac
-       ;;
-    esac
+# There used to be:
+#  The mysterious io_xs memory corruption in 11.00 32bit seems to get
+#  fixed by not using Perl's malloc.  Flip side is performance loss.
+#  So we want mymalloc for all situations possible
+# That set usemymalloc to 'n' for threaded builds and non-gcc 32bit
+#  non-debugging builds and 'y' for all others
 
 usemymalloc='n'
 case "$useperlio" in
@@ -673,10 +659,10 @@ case "$useperlio" in
 
 # malloc wrap works
 case "$usemallocwrap" in
-'') usemallocwrap='define' ;;
-esac
+    '') usemallocwrap='define' ;;
+    esac
 
-# ctime_r() and asctime_r() seem to have issues for versions before
+# ctime_r () and asctime_r () seem to have issues for versions before
 # HP-UX 11
 if [ $xxOsRevMajor -lt 11 ]; then
     d_ctime_r="$undef"
@@ -684,7 +670,7 @@ if [ $xxOsRevMajor -lt 11 ]; then
     fi
 
 
-# fpclassify() is a macro, the library call is Fpclassify
+# fpclassify () is a macro, the library call is Fpclassify
 # Similarly with the others below.
 d_fpclassify='define'
 d_isnan='define'