foxiepaws
/
weechat
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

api: replace type "regex_t *" by "void *" in function string_regcomp (fix ruby compilation with autotools)

v2.8-utf8proc
Sebastien Helleu 2012-01-26 18:18:20 +01:00
parent 9a821b9d3c
commit 9347bae962
6 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/en/weechat_plugin_api.en.txt
View File

@ -1090,7 +1090,7 @@ Prototype:
[source,C]
----------------------------------------
int weechat_string_regcomp (regex_t *preg, const char *regex, int default_flags)
int weechat_string_regcomp (void *preg, const char *regex, int default_flags)
----------------------------------------
Arguments:

2
doc/fr/weechat_plugin_api.fr.txt
View File

@ -1105,7 +1105,7 @@ Prototype :
[source,C]
----------------------------------------
int weechat_string_regcomp (regex_t *preg, const char *regex, int default_flags)
int weechat_string_regcomp (void *preg, const char *regex, int default_flags)
----------------------------------------
Paramètres :

2
doc/it/weechat_plugin_api.it.txt
View File

@ -1117,7 +1117,7 @@ Prototipo:
[source,C]
----------------------------------------
int weechat_string_regcomp (regex_t *preg, const char *regex, int default_flags)
int weechat_string_regcomp (void *preg, const char *regex, int default_flags)
----------------------------------------
Argomenti:

4
src/core/wee-string.c
View File

@ -804,13 +804,13 @@ string_regex_flags (const char *regex, int default_flags, int *flags)
*/
int
string_regcomp (regex_t *preg, const char *regex, int default_flags)
string_regcomp (void *preg, const char *regex, int default_flags)
{
const char *ptr_regex;
int flags;
ptr_regex = string_regex_flags (regex, default_flags, &flags);
return regcomp (preg, ptr_regex, flags);
return regcomp ((regex_t *)preg, ptr_regex, flags);
}
/*

2
src/core/wee-string.h
View File

@ -51,7 +51,7 @@ extern char *string_convert_hex_chars (const char *string);
extern char *string_mask_to_regex (const char *mask);
extern const char *string_regex_flags (const char *regex, int default_flags,
int *flags);
extern int string_regcomp (regex_t *preg, const char *regex, int default_flags);
extern int string_regcomp (void *preg, const char *regex, int default_flags);
extern int string_has_highlight (const char *string,
const char *highlight_words);
extern int string_has_highlight_regex_compiled (const char *string,

3
src/plugins/weechat-plugin.h
View File

@ -26,7 +26,6 @@
#define __WEECHAT_WEECHAT_PLUGIN_H 1
#include <sys/types.h>
#include <regex.h>
struct t_config_option;
struct t_gui_window;
@ -229,7 +228,7 @@ struct t_weechat_plugin
char *(*string_mask_to_regex) (const char *mask);
const char *(*string_regex_flags) (const char *regex, int default_flags,
int *flags);
int (*string_regcomp) (regex_t *preg, const char *regex, int default_flags);
int (*string_regcomp) (void *preg, const char *regex, int default_flags);
int (*string_has_highlight) (const char *string,
const char *highlight_words);
int (*string_has_highlight_regex) (const char *string, const char *regex);