regex.h | regex.h | |||
---|---|---|---|---|
/* | /* | |||
regex.h - POSIX.2 compatible regexp interface and TRE extensions | regex.h - POSIX.2 compatible regexp interface and TRE extensions | |||
Copyright (C) 2001-2003 Ville Laurikari <vl@iki.fi>. | Copyright (C) 2001-2004 Ville Laurikari <vl@iki.fi>. | |||
This program is free software; you can redistribute it and/or modify | This program is free software; you can redistribute it and/or modify | |||
it under the terms of the GNU General Public License version 2 (June | it under the terms of the GNU General Public License version 2 (June | |||
1991) as published by the Free Software Foundation. | 1991) as published by the Free Software Foundation. | |||
This program is distributed in the hope that it will be useful, | This program is distributed in the hope that it will be useful, | |||
but WITHOUT ANY WARRANTY; without even the implied warranty of | but WITHOUT ANY WARRANTY; without even the implied warranty of | |||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |||
GNU General Public License for more details. | GNU General Public License for more details. | |||
skipping to change at line 30 | skipping to change at line 30 | |||
#ifndef TRE_REGEX_H | #ifndef TRE_REGEX_H | |||
#define TRE_REGEX_H 1 | #define TRE_REGEX_H 1 | |||
#include "tre-config.h" | #include "tre-config.h" | |||
#ifdef HAVE_SYS_TYPES_H | #ifdef HAVE_SYS_TYPES_H | |||
#include <sys/types.h> | #include <sys/types.h> | |||
#endif /* HAVE_SYS_TYPES_H */ | #endif /* HAVE_SYS_TYPES_H */ | |||
#ifdef HAVE_LIBUTF8_H | ||||
#include <libutf8.h> | ||||
#endif /* HAVE_LIBUTF8_H */ | ||||
#ifdef TRE_USE_SYSTEM_REGEX_H | #ifdef TRE_USE_SYSTEM_REGEX_H | |||
/* Include the system regex.h to make TRE ABI compatible with the | /* Include the system regex.h to make TRE ABI compatible with the | |||
system regex. */ | system regex. */ | |||
#include TRE_SYSTEM_REGEX_H_PATH | #include TRE_SYSTEM_REGEX_H_PATH | |||
#endif /* TRE_USE_SYSTEM_REGEX_H */ | #endif /* TRE_USE_SYSTEM_REGEX_H */ | |||
#ifdef __cplusplus | #ifdef __cplusplus | |||
extern "C" { | extern "C" { | |||
#endif | #endif | |||
skipping to change at line 184 | skipping to change at line 188 | |||
int regawexec(const regex_t *preg, const wchar_t *string, | int regawexec(const regex_t *preg, const wchar_t *string, | |||
regamatch_t *match, regaparams_t params, int eflags); | regamatch_t *match, regaparams_t params, int eflags); | |||
int regawnexec(const regex_t *preg, const wchar_t *string, size_t len, | int regawnexec(const regex_t *preg, const wchar_t *string, size_t len, | |||
regamatch_t *match, regaparams_t params, int eflags); | regamatch_t *match, regaparams_t params, int eflags); | |||
#endif /* TRE_WCHAR */ | #endif /* TRE_WCHAR */ | |||
/* Sets the parameters to default values. */ | /* Sets the parameters to default values. */ | |||
void regaparams_default(regaparams_t *params); | void regaparams_default(regaparams_t *params); | |||
#endif /* TRE_APPROX */ | #endif /* TRE_APPROX */ | |||
/* Returns the version string. The returned string is static. */ | ||||
char *tre_version(void); | ||||
int tre_config(int query, void *result); | ||||
enum { | ||||
TRE_CONFIG_APPROX, | ||||
TRE_CONFIG_WCHAR, | ||||
TRE_CONFIG_MULTIBYTE, | ||||
TRE_CONFIG_SYSTEM_ABI, | ||||
TRE_CONFIG_VERSION | ||||
}; | ||||
#ifdef __cplusplus | #ifdef __cplusplus | |||
} | } | |||
#endif | #endif | |||
#endif /* TRE_REGEX_H */ | #endif /* TRE_REGEX_H */ | |||
/* EOF */ | /* EOF */ | |||
End of changes. 3 change blocks. | ||||
1 lines changed or deleted | 18 lines changed or added | |||
tre-config.h | tre-config.h | |||
---|---|---|---|---|
/* lib/tre-config.h. Generated by configure. */ | /* lib/tre-config.h. Generated by configure. */ | |||
/* tre-config.h.in. This file defines all compile time definitions | /* tre-config.h.in. This file defines all compile time definitions | |||
that are needed in `regex.h'. */ | that are needed in `regex.h'. */ | |||
/* Define to 1 if you have the <libutf8.h> header file. */ | ||||
/* #undef HAVE_LIBUTF8_H */ | ||||
/* Define to 1 if the system has the type `reg_errcode_t'. */ | /* Define to 1 if the system has the type `reg_errcode_t'. */ | |||
/* #undef HAVE_REG_ERRCODE_T */ | /* #undef HAVE_REG_ERRCODE_T */ | |||
/* Define to 1 if you have the <sys/types.h> header file. */ | /* Define to 1 if you have the <sys/types.h> header file. */ | |||
#define HAVE_SYS_TYPES_H 1 | #define HAVE_SYS_TYPES_H 1 | |||
/* Define to 1 if you have the <wchar.h> header file. */ | /* Define to 1 if you have the <wchar.h> header file. */ | |||
#define HAVE_WCHAR_H 1 | #define HAVE_WCHAR_H 1 | |||
/* Define if you want to enable approximate matching functionality. */ | /* Define if you want to enable approximate matching functionality. */ | |||
skipping to change at line 30 | skipping to change at line 33 | |||
/* Define to the absolute path to the system regex.h */ | /* Define to the absolute path to the system regex.h */ | |||
/* #undef TRE_SYSTEM_REGEX_H_PATH */ | /* #undef TRE_SYSTEM_REGEX_H_PATH */ | |||
/* Define to include the system regex.h from TRE regex.h */ | /* Define to include the system regex.h from TRE regex.h */ | |||
/* #undef TRE_USE_SYSTEM_REGEX_H */ | /* #undef TRE_USE_SYSTEM_REGEX_H */ | |||
/* Define to enable wide character (wchar_t) support. */ | /* Define to enable wide character (wchar_t) support. */ | |||
#define TRE_WCHAR 1 | #define TRE_WCHAR 1 | |||
/* TRE version string. */ | /* TRE version string. */ | |||
#define TRE_VERSION "0.6.6" | #define TRE_VERSION "0.6.7" | |||
/* TRE version level 1. */ | /* TRE version level 1. */ | |||
#define TRE_VERSION_1 0 | #define TRE_VERSION_1 0 | |||
/* TRE version level 2. */ | /* TRE version level 2. */ | |||
#define TRE_VERSION_2 6 | #define TRE_VERSION_2 6 | |||
/* TRE version level 3. */ | /* TRE version level 3. */ | |||
#define TRE_VERSION_3 6 | #define TRE_VERSION_3 7 | |||
End of changes. 3 change blocks. | ||||
1 lines changed or deleted | 4 lines changed or added | |||