summaryrefslogtreecommitdiff
path: root/oniguruma.h
diff options
context:
space:
mode:
authorksaito <ksaito@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-02-13 01:54:52 +0000
committerksaito <ksaito@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-02-13 01:54:52 +0000
commit7049aeb893d9bc9b7205e2f70581760cb54091ab (patch)
treecd11abe5bd68146ddbf7ad300bde58907d261fab /oniguruma.h
parent2e3d3bb91681a9f916f862a05ebc9736a15e3dda (diff)
* oniggnu.h, oniguruma.h, regcomp.c, st.c: imported Oni Guruma 3.6.0.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7959 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'oniguruma.h')
-rw-r--r--oniguruma.h26
1 files changed, 19 insertions, 7 deletions
diff --git a/oniguruma.h b/oniguruma.h
index 95cd109384..69dd939e5b 100644
--- a/oniguruma.h
+++ b/oniguruma.h
@@ -29,10 +29,14 @@
* SUCH DAMAGE.
*/
+#ifdef __cplusplus
+extern "C" {
+#endif
+
#define ONIGURUMA
#define ONIGURUMA_VERSION_MAJOR 3
-#define ONIGURUMA_VERSION_MINOR 5
-#define ONIGURUMA_VERSION_TEENY 4
+#define ONIGURUMA_VERSION_MINOR 6
+#define ONIGURUMA_VERSION_TEENY 0
#ifdef __cplusplus
# ifndef HAVE_PROTOTYPES
@@ -82,6 +86,10 @@ typedef unsigned int OnigDistance;
#define ONIG_INFINITE_DISTANCE ~((OnigDistance )0)
/* ambiguous match flag */
+typedef unsigned int OnigAmbigType;
+
+ONIG_EXTERN OnigAmbigType OnigDefaultAmbigFlag;
+
#define ONIGENC_AMBIGUOUS_MATCH_NONE 0
#define ONIGENC_AMBIGUOUS_MATCH_ASCII_CASE (1<<0)
#define ONIGENC_AMBIGUOUS_MATCH_NONASCII_CASE (1<<1)
@@ -96,12 +104,8 @@ typedef unsigned int OnigDistance;
( ONIGENC_AMBIGUOUS_MATCH_ASCII_CASE | \
ONIGENC_AMBIGUOUS_MATCH_NONASCII_CASE | \
ONIGENC_AMBIGUOUS_MATCH_COMPOUND )
-#define ONIGENC_AMBIGUOUS_MATCH_DEFAULT \
- (ONIGENC_AMBIGUOUS_MATCH_ASCII_CASE | \
- ONIGENC_AMBIGUOUS_MATCH_NONASCII_CASE | \
- ONIGENC_AMBIGUOUS_MATCH_COMPOUND )
+#define ONIGENC_AMBIGUOUS_MATCH_DEFAULT OnigDefaultAmbigFlag
-typedef unsigned int OnigAmbigType;
#define ONIGENC_MAX_COMP_AMBIG_CODE_LEN 3
#define ONIGENC_MAX_COMP_AMBIG_CODE_ITEM_NUM 4
@@ -851,6 +855,10 @@ int onig_set_meta_char P_((OnigEncoding enc, unsigned int what, OnigCodePoint co
ONIG_EXTERN
void onig_copy_encoding P_((OnigEncoding to, OnigEncoding from));
ONIG_EXTERN
+OnigAmbigType onig_get_default_ambig_flag P_(());
+ONIG_EXTERN
+int onig_set_default_ambig_flag P_((OnigAmbigType ambig_flag));
+ONIG_EXTERN
unsigned int onig_get_match_stack_limit_size P_((void));
ONIG_EXTERN
int onig_set_match_stack_limit_size P_((unsigned int size));
@@ -861,4 +869,8 @@ const char* onig_version P_((void));
ONIG_EXTERN
const char* onig_copyright P_((void));
+#ifdef __cplusplus
+}
+#endif
+
#endif /* ONIGURUMA_H */