From cf91a2b3c196ee4d7be93ab9f8fc8e097128ad68 Mon Sep 17 00:00:00 2001
From: Tomas Mraz <tomas@openssl.org>
Date: Thu, 5 May 2022 12:35:11 +0200
Subject: [PATCH] Include the e_os.h before string.h

Fixes #18244

Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/18282)
---
 crypto/ctype.c    | 3 +--
 test/localetest.c | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/crypto/ctype.c b/crypto/ctype.c
index f90ef19e79..dc93015917 100644
--- a/crypto/ctype.c
+++ b/crypto/ctype.c
@@ -7,12 +7,11 @@
  * https://www.openssl.org/source/license.html
  */
 
+#include "internal/e_os.h"
 #include <string.h>
 #include <stdio.h>
 #include "crypto/ctype.h"
 #include <openssl/ebcdic.h>
-
-#include "internal/e_os.h"
 #include "internal/core.h"
 #ifndef OPENSSL_NO_LOCALE
 # include <locale.h>
diff --git a/test/localetest.c b/test/localetest.c
index 9f13d38550..616356a140 100644
--- a/test/localetest.c
+++ b/test/localetest.c
@@ -7,14 +7,14 @@
  * https://www.openssl.org/source/license.html
  */
 
+#include "internal/e_os.h"
 #include <stdio.h>
 #include <string.h>
+#include <stdlib.h>
 #include <openssl/x509.h>
 #include "testutil.h"
 #include "testutil/output.h"
 
-#include <stdlib.h>
-#include "internal/e_os.h"
 #ifndef OPENSSL_NO_LOCALE
 # include <locale.h>
 # ifdef OPENSSL_SYS_MACOSX