diff options
author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2018-03-20 07:26:48 +0100 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2018-03-20 07:26:48 +0100 |
commit | 8309cf5867aabde511db492366cbbec39d45e0cb (patch) | |
tree | f456bb7bf59fb67a8d099eb4dca819e1c71a1d0e /src/reggnu.c | |
parent | 2f7903e9688734698615db5889efa21ffaf59c4d (diff) | |
parent | 6c434f095b49a3c33c6e34f27f0bff906f162d85 (diff) |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'src/reggnu.c')
-rw-r--r-- | src/reggnu.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/reggnu.c b/src/reggnu.c index 50eb9b4..37c7519 100644 --- a/src/reggnu.c +++ b/src/reggnu.c @@ -2,7 +2,7 @@ reggnu.c - Oniguruma (regular expression library) **********************************************************************/ /*- - * Copyright (c) 2002-2017 K.Kosako <sndgk393 AT ybb DOT ne DOT jp> + * Copyright (c) 2002-2018 K.Kosako <sndgk393 AT ybb DOT ne DOT jp> * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -28,10 +28,7 @@ */ #include "regint.h" - -#ifndef ONIGGNU_H #include "oniggnu.h" -#endif extern void re_free_registers(OnigRegion* r) @@ -140,8 +137,7 @@ re_mbcinit(int mb_code) break; } - onig_initialize(0, 0); - onig_initialize_encoding(enc); + onig_initialize(&enc, 1); onigenc_set_default_encoding(enc); } |