X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=test%2Fctype_internal_test.c;h=b0aac6a4d2fca7e2dc389bd839090c06470aba57;hb=03f30c552a07eb7686a9fc099b06653548afa941;hp=9cb2321bc014ee10d47e13594f910244c253dfdc;hpb=677963e5a428739062ab5d46d5baed5eadd0195d;p=oweals%2Fopenssl.git

diff --git a/test/ctype_internal_test.c b/test/ctype_internal_test.c
index 9cb2321bc0..b0aac6a4d2 100644
--- a/test/ctype_internal_test.c
+++ b/test/ctype_internal_test.c
@@ -1,7 +1,7 @@
 /*
- * Copyright 2017 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2017-2018 The OpenSSL Project Authors. All Rights Reserved.
  *
- * Licensed under the OpenSSL license (the "License").  You may not use
+ * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
  * in the file LICENSE in the source distribution or at
  * https://www.openssl.org/source/license.html
@@ -15,10 +15,10 @@
 
 /*
  * Even though the VMS C RTL claims to be C99 compatible, it's not entirely
- * so far (C RTL version 8.4).  For the sake of these tests, we therefore
- * define our own.
+ * so far (C RTL version 8.4). Same applies to OSF. For the sake of these
+ * tests, we therefore define our own.
  */
-#if defined(__VMS) && __CRTL_VER <= 80400000
+#if (defined(__VMS) && __CRTL_VER <= 80400000) || defined(__osf__)
 static int isblank(int c)
 {
     return c == ' ' || c == '\t';
@@ -35,7 +35,9 @@ static int test_ctype_chars(int n)
 
     return TEST_int_eq(isalpha(n) != 0, ossl_isalpha(n) != 0)
            && TEST_int_eq(isalnum(n) != 0, ossl_isalnum(n) != 0)
+#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
            && TEST_int_eq(isblank(n) != 0, ossl_isblank(n) != 0)
+#endif
            && TEST_int_eq(iscntrl(n) != 0, ossl_iscntrl(n) != 0)
            && TEST_int_eq(isdigit(n) != 0, ossl_isdigit(n) != 0)
            && TEST_int_eq(isgraph(n) != 0, ossl_isgraph(n) != 0)