aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorK.Kosako <kosako@sofnec.co.jp>2020-01-14 17:45:29 +0900
committerK.Kosako <kosako@sofnec.co.jp>2020-01-14 17:45:29 +0900
commita4adc56fb1b4b832374c2677e036c1b435f680dd (patch)
tree652f351964cccf3ae9fc4c965de001030aca2f84
parent59fcf45fce0c82dd27116058ec8df00a99f65fe8 (diff)
downloadoniguruma-a4adc56fb1b4b832374c2677e036c1b435f680dd.zip
oniguruma-a4adc56fb1b4b832374c2677e036c1b435f680dd.tar.gz
oniguruma-a4adc56fb1b4b832374c2677e036c1b435f680dd.tar.bz2
move xmemset, xmemcpy and xmemmove into ONIGURUMA_SYS_UEFI
-rw-r--r--src/regint.h27
1 files changed, 15 insertions, 12 deletions
diff --git a/src/regint.h b/src/regint.h
index 0eaca51..a22fcd3 100644
--- a/src/regint.h
+++ b/src/regint.h
@@ -145,6 +145,21 @@
#endif /* USE_TIMEOFDAY */
#endif /* ONIG_DEBUG_STATISTICS */
+/* I don't think these x....'s need to be included in ONIGURUMA_SYS_UEFI,
+ but they are required by Issue #170 and do so since there is no problem.
+ */
+#ifndef xmemset
+#define xmemset memset
+#endif
+
+#ifndef xmemcpy
+#define xmemcpy memcpy
+#endif
+
+#ifndef xmemmove
+#define xmemmove memmove
+#endif
+
#endif /* ONIGURUMA_SYS_UEFI */
@@ -198,18 +213,6 @@
#define onig_st_is_member st_is_member
-#ifndef xmemset
-#define xmemset memset
-#endif
-
-#ifndef xmemcpy
-#define xmemcpy memcpy
-#endif
-
-#ifndef xmemmove
-#define xmemmove memmove
-#endif
-
#if defined(_WIN32) && !defined(__GNUC__)
#ifndef xalloca