From 412ccea6c986da28b28f4b822483f779263eb138 Mon Sep 17 00:00:00 2001
From: Andy Wingo <wingo@pobox.com>
Date: Sun, 15 May 2011 10:52:37 +0200
Subject: [PATCH] remove ENGNOT from __scm.h

* libguile/__scm.h: Remove #undef ENGNOT.
* libguile/numbers.c (idbl2str): Remove #ifdef ENGNOT sections.
---
 libguile/__scm.h   | 4 ----
 libguile/numbers.c | 9 ---------
 2 files changed, 13 deletions(-)

diff --git a/libguile/__scm.h b/libguile/__scm.h
index e3ba75227..810396420 100644
--- a/libguile/__scm.h
+++ b/libguile/__scm.h
@@ -153,10 +153,6 @@
 /* #define GUILE_DEBUG_FREELIST */
 
 
-/* Use engineering notation when converting numbers strings?
- */
-#undef ENGNOT
-
 
 /* {Unsupported Options}
  *
diff --git a/libguile/numbers.c b/libguile/numbers.c
index 057a69ca6..9002a38d8 100644
--- a/libguile/numbers.c
+++ b/libguile/numbers.c
@@ -5109,12 +5109,6 @@ idbl2str (double f, char *a, int radix)
       exp++;
     }
  zero:
-#ifdef ENGNOT 
-  /* adding 9999 makes this equivalent to abs(x) % 3 */
-  dpt = (exp + 9999) % 3;
-  exp -= dpt++;
-  efmt = 1;
-#else
   efmt = (exp < -3) || (exp > wp + 2);
   if (!efmt)
     {
@@ -5131,7 +5125,6 @@ idbl2str (double f, char *a, int radix)
     }
   else
     dpt = 1;
-#endif
 
   do
     {
@@ -5153,7 +5146,6 @@ idbl2str (double f, char *a, int radix)
 
   if (dpt > 0)
     {
-#ifndef ENGNOT
       if ((dpt > 4) && (exp > 6))
 	{
 	  d = (a[0] == '-' ? 2 : 1);
@@ -5163,7 +5155,6 @@ idbl2str (double f, char *a, int radix)
 	  efmt = 1;
 	}
       else
-#endif
 	{
 	  while (--dpt)
 	    a[ch++] = '0';