X-Git-Url: https://ncurses.scripts.mit.edu/?a=blobdiff_plain;f=form%2Ffty_regex.c;h=616b383ad49ef2d5febd99e9f9cffde4424ae8d6;hb=bec710451bd1f286840c4e7e18fc646bd63adeba;hp=da0ef08c29b3006a3a0aa19ad0850d0a271582cd;hpb=47d2fb4537d9ad5bb14f4810561a327930ca4280;p=ncurses.git diff --git a/form/fty_regex.c b/form/fty_regex.c index da0ef08c..616b383a 100644 --- a/form/fty_regex.c +++ b/form/fty_regex.c @@ -35,12 +35,12 @@ #include "form.priv.h" -MODULE_ID("$Id: fty_regex.c,v 1.28 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: fty_regex.c,v 1.32 2020/12/12 01:15:37 tom Exp $") #if HAVE_REGEX_H_FUNCS || HAVE_LIB_PCRE2 /* We prefer POSIX regex */ -#if HAVE_PCRE2_POSIX_H -#include +#if HAVE_PCRE2POSIX_H +#include #elif HAVE_PCREPOSIX_H #include #else @@ -340,14 +340,14 @@ static FIELDTYPE typeREGEXP = #endif }; -NCURSES_EXPORT_VAR(FIELDTYPE*) TYPE_REGEXP = &typeREGEXP; +FORM_EXPORT_VAR(FIELDTYPE *) TYPE_REGEXP = &typeREGEXP; #if NCURSES_INTEROP_FUNCS /* The next routines are to simplify the use of ncurses from - programming languages with restictions on interop with C level + programming languages with restrictions on interop with C level constructs (e.g. variable access or va_list + ellipsis constructs) */ -NCURSES_EXPORT(FIELDTYPE *) +FORM_EXPORT(FIELDTYPE *) _nc_TYPE_REGEXP(void) { return TYPE_REGEXP;