diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index e40866c6615..464b690e173 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,8 @@
+2003-11-24  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
+
+	* adadecode.c: Only include ctype.h if IN_GCC.
+	(__gnat_decode): Use ISDIGIT from safe-ctype.h.
+
 2003-11-24  Jose Ruiz  <ruiz@act-europe.fr>
 
 	* Makefile.in: 
diff --git a/gcc/ada/adadecode.c b/gcc/ada/adadecode.c
index ef77c5f9ddf..fe0253ee09f 100644
--- a/gcc/ada/adadecode.c
+++ b/gcc/ada/adadecode.c
@@ -35,10 +35,11 @@
 #include "system.h"
 #else
 #include <stdio.h>
+#include <ctype.h>
+#define ISDIGIT(c) isdigit(c)
 #define PARMS(ARGS) ARGS
 #endif
 
-#include <ctype.h>
 #include "adadecode.h"
 
 static void add_verbose (const char *, char *);
@@ -207,7 +208,7 @@ __gnat_decode (const char *coded_name, char *ada_name, int verbose)
     int n_digits = 0;
 
     if (len > 1)
-      while (isdigit ((int) ada_name[(int) len - 1 - n_digits]))
+      while (ISDIGIT ((int) ada_name[(int) len - 1 - n_digits]))
 	n_digits++;
 
     /* Check if we have $ or __ before digits.  */