diff --git a/apache2/msc_util.c b/apache2/msc_util.c
index 240b9471..c43a7648 100644
--- a/apache2/msc_util.c
+++ b/apache2/msc_util.c
@@ -889,7 +889,7 @@ int ansi_c_sequences_decode_inplace(unsigned char *input, int input_len) {
                     }
                 }
                 else
-                if (isdigit(input[i + 1])) { /* Octal. */
+                if (ISODIGIT(input[i + 1])) { /* Octal. */
                     char buf[10];
                     int j = 0, l = 3;
 
diff --git a/apache2/msc_util.h b/apache2/msc_util.h
index a77c832b..de9a1488 100644
--- a/apache2/msc_util.h
+++ b/apache2/msc_util.h
@@ -35,7 +35,7 @@ int DSOLOCAL is_token_char(unsigned char c);
 
 int DSOLOCAL remove_lf_crlf_inplace(char *text);
 
-unsigned DSOLOCAL char x2c(unsigned char *what);
+unsigned char DSOLOCAL x2c(unsigned char *what);
 
 char DSOLOCAL *guess_tmp_dir(apr_pool_t *p);