diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index cb34d8d05..89dcac2c1 100644
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-12  Ludovic Courtès <ludovic.courtes@laas.fr>
+
+	* numbers.c (guile_ieee_init): Use regular ANSI C casts rather
+	than C++-style `X_CAST ()'.  Patch posted by by Mike Gran.
+
 2006-06-13  Ludovic Courtès <ludovic.courtes@laas.fr>
 
 	* eq.c: Include "struct.h", "goops.h" and "objects.h".
diff --git a/libguile/numbers.c b/libguile/numbers.c
index 3b6d781af..caaa6e2fc 100644
--- a/libguile/numbers.c
+++ b/libguile/numbers.c
@@ -598,7 +598,7 @@ guile_ieee_init (void)
 #elif HAVE_DINFINITY
   /* OSF */
   extern unsigned int DINFINITY[2];
-  guile_Inf = (*(X_CAST(double *, DINFINITY)));
+  guile_Inf = (*((double *) (DINFINITY)));
 #else
   double tmp = 1e+10;
   guile_Inf = tmp;
@@ -619,9 +619,11 @@ guile_ieee_init (void)
   /* C99 NAN, when available */
   guile_NaN = NAN;
 #elif HAVE_DQNAN
-  /* OSF */
-  extern unsigned int DQNAN[2];
-  guile_NaN =  (*(X_CAST(double *, DQNAN)));
+  {
+    /* OSF */
+    extern unsigned int DQNAN[2];
+    guile_NaN = (*((double *)(DQNAN)));
+  }
 #else
   guile_NaN = guile_Inf / guile_Inf;
 #endif