MdeModulePkg RegularExpressionDxe: Update Oniguruma to 6.9.0

[mirror_edk2.git] / MdeModulePkg / Universal / RegularExpressionDxe / Oniguruma / onigposix.h

diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/onigposix.h b/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/onigposix.h
index 7c2cad123be667ecc4c3f2eb97b60e52f28e555c..62266da76e75a8d7709542b6733c300136ebac9d 100644 (file)
--- a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/onigposix.h
+++ b/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/onigposix.h
@@ -4,7 +4,7 @@
   onigposix.h - Oniguruma (regular expression library)\r
 **********************************************************************/\r
 /*-\r
- * Copyright (c) 2002-2005  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>\r
+ * Copyright (c) 2002-2018  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>\r
  * All rights reserved.\r
  *\r
  * Redistribution and use in source and binary forms, with or without\r
@@ -39,7 +39,7 @@ extern "C" {
 #define REG_NEWLINE        (1<<1)\r
 #define REG_NOTBOL         (1<<2)\r
 #define REG_NOTEOL         (1<<3)\r
-#define REG_EXTENDED       (1<<4) /* if not setted, Basic Onigular Expression */\r
+#define REG_EXTENDED       (1<<4) /* if not set, Basic Onigular Expression */\r
 #define REG_NOSUB          (1<<5)\r
 \r
 /* POSIX error codes */\r
@@ -61,7 +61,7 @@ extern "C" {
 #define REG_EONIG_INTERNAL  14\r
 #define REG_EONIG_BADWC     15\r
 #define REG_EONIG_BADARG    16\r
-#define REG_EONIG_THREAD    17\r
+/* #define REG_EONIG_THREAD    17 */\r
 \r
 /* character encodings (for reg_set_encoding()) */\r
 #define REG_POSIX_ENCODING_ASCII     0\r
@@ -97,7 +97,7 @@ typedef struct {
 \r
 #ifndef ONIG_EXTERN\r
 #if defined(_WIN32) && !defined(__GNUC__)\r
-#if defined(EXPORT)\r
+#if defined(ONIGURUMA_EXPORT)\r
 #define ONIG_EXTERN   extern __declspec(dllexport)\r
 #else\r
 #define ONIG_EXTERN   extern __declspec(dllimport)\r
@@ -128,6 +128,7 @@ ONIG_EXTERN OnigSyntaxType OnigSyntaxGnuRegex;
 ONIG_EXTERN OnigSyntaxType OnigSyntaxJava;\r
 ONIG_EXTERN OnigSyntaxType OnigSyntaxPerl;\r
 ONIG_EXTERN OnigSyntaxType OnigSyntaxRuby;\r
+ONIG_EXTERN OnigSyntaxType OnigSyntaxOniguruma;\r
 \r
 /* predefined syntaxes (see regsyntax.c) */\r
 #define ONIG_SYNTAX_POSIX_BASIC        (&OnigSyntaxPosixBasic)\r
@@ -138,6 +139,7 @@ ONIG_EXTERN OnigSyntaxType OnigSyntaxRuby;
 #define ONIG_SYNTAX_JAVA               (&OnigSyntaxJava)\r
 #define ONIG_SYNTAX_PERL               (&OnigSyntaxPerl)\r
 #define ONIG_SYNTAX_RUBY               (&OnigSyntaxRuby)\r
+#define ONIG_SYNTAX_ONIGURUMA          (&OnigSyntaxOniguruma)\r
 /* default syntax */\r
 #define ONIG_SYNTAX_DEFAULT             OnigDefaultSyntax\r
 \r
@@ -147,6 +149,7 @@ ONIG_EXTERN int  onig_set_default_syntax P_((OnigSyntaxType* syntax));
 ONIG_EXTERN void onig_copy_syntax P_((OnigSyntaxType* to, OnigSyntaxType* from));\r
 ONIG_EXTERN const char* onig_version P_((void));\r
 ONIG_EXTERN const char* onig_copyright P_((void));\r
+ONIG_EXTERN int onig_end P_((void));\r
 \r
 #endif /* ONIGURUMA_H */\r
 \r