mirror of
https://github.com/kerberos-io/openalpr-base.git
synced 2025-10-06 04:26:52 +08:00
Fixed Windows compile issues
This commit is contained in:
@@ -1,6 +1,10 @@
|
|||||||
/* config.h. Generated from config.h.in by configure. */
|
/* config.h. Generated from config.h.in by configure. */
|
||||||
/* config.h.in. Generated from configure.in by autoheader. */
|
/* config.h.in. Generated from configure.in by autoheader. */
|
||||||
|
|
||||||
|
#ifdef _WIN32
|
||||||
|
#include "win32/onig_config.h"
|
||||||
|
#else
|
||||||
|
|
||||||
/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
|
/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
|
||||||
systems. This function is required for `alloca.c' support on those systems.
|
systems. This function is required for `alloca.c' support on those systems.
|
||||||
*/
|
*/
|
||||||
@@ -120,3 +124,7 @@
|
|||||||
|
|
||||||
/* Define to `unsigned int' if <sys/types.h> does not define. */
|
/* Define to `unsigned int' if <sys/types.h> does not define. */
|
||||||
/* #undef size_t */
|
/* #undef size_t */
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
#endif
|
@@ -81,7 +81,7 @@ extern "C" {
|
|||||||
#if defined(EXPORT) || defined(RUBY_EXPORT)
|
#if defined(EXPORT) || defined(RUBY_EXPORT)
|
||||||
#define ONIG_EXTERN extern __declspec(dllexport)
|
#define ONIG_EXTERN extern __declspec(dllexport)
|
||||||
#else
|
#else
|
||||||
#define ONIG_EXTERN extern __declspec(dllimport)
|
#define ONIG_EXTERN extern
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
@@ -29,7 +29,7 @@
|
|||||||
|
|
||||||
#include "regint.h"
|
#include "regint.h"
|
||||||
|
|
||||||
OnigEncoding OnigEncDefaultCharEncoding = ONIG_ENCODING_INIT_DEFAULT;
|
OnigEncoding OnigEncDefaultCharEncoding = NULL;
|
||||||
|
|
||||||
extern int
|
extern int
|
||||||
onigenc_init(void)
|
onigenc_init(void)
|
||||||
@@ -40,6 +40,9 @@ onigenc_init(void)
|
|||||||
extern OnigEncoding
|
extern OnigEncoding
|
||||||
onigenc_get_default_encoding(void)
|
onigenc_get_default_encoding(void)
|
||||||
{
|
{
|
||||||
|
if (OnigEncDefaultCharEncoding == NULL)
|
||||||
|
OnigEncDefaultCharEncoding = ONIG_ENCODING_INIT_DEFAULT;
|
||||||
|
|
||||||
return OnigEncDefaultCharEncoding;
|
return OnigEncDefaultCharEncoding;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -170,7 +170,7 @@
|
|||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(HAVE_ALLOCA_H) && !defined(__GNUC__)
|
#if defined(HAVE_ALLOCA_H) && !defined(_WIN32) && !defined(__GNUC__)
|
||||||
#include <alloca.h>
|
#include <alloca.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user