Changes required for VS 2005 and Yate 2
git-svn-id: http://voip.null.ro/svn/yate@1486 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
parent
0883250323
commit
6bc06d57d8
|
@ -88,6 +88,9 @@ using namespace TelEngine;
|
|||
#ifndef MOD_PATH
|
||||
#define MOD_PATH "." PATH_SEP "modules"
|
||||
#endif
|
||||
#ifndef SHR_PATH
|
||||
#define SHR_PATH "." PATH_SEP "share"
|
||||
#endif
|
||||
#ifndef CFG_PATH
|
||||
#define CFG_PATH "." PATH_SEP "conf.d"
|
||||
#endif
|
||||
|
|
|
@ -4873,8 +4873,8 @@ regexec (preg, string, nmatch, pmatch, eflags)
|
|||
from either regcomp or regexec. We don't use PREG here. */
|
||||
|
||||
size_t
|
||||
regerror (errcode, preg, errbuf, errbuf_size)
|
||||
int errcode;
|
||||
regerror (err_code, preg, errbuf, errbuf_size)
|
||||
int err_code;
|
||||
const regex_t *preg;
|
||||
char *errbuf;
|
||||
size_t errbuf_size;
|
||||
|
@ -4882,15 +4882,15 @@ regerror (errcode, preg, errbuf, errbuf_size)
|
|||
const char *msg;
|
||||
size_t msg_size;
|
||||
|
||||
if (errcode < 0
|
||||
|| errcode >= (sizeof (re_error_msg) / sizeof (re_error_msg[0])))
|
||||
if (err_code < 0
|
||||
|| err_code >= (sizeof (re_error_msg) / sizeof (re_error_msg[0])))
|
||||
/* Only error codes returned by the rest of the code should be passed
|
||||
to this routine. If we are given anything else, or if other regex
|
||||
code generates an invalid error code, then the program has a bug.
|
||||
Dump core so we can fix it. */
|
||||
abort ();
|
||||
|
||||
msg = re_error_msg[errcode];
|
||||
msg = re_error_msg[err_code];
|
||||
|
||||
/* POSIX doesn't require that we do anything in this case, but why
|
||||
not be nice. */
|
||||
|
|
|
@ -479,7 +479,7 @@ extern int regexec
|
|||
_RE_ARGS ((const regex_t *preg, const char *string, size_t nmatch,
|
||||
regmatch_t pmatch[], int eflags));
|
||||
extern size_t regerror
|
||||
_RE_ARGS ((int errcode, const regex_t *preg, char *errbuf,
|
||||
_RE_ARGS ((int err_code, const regex_t *preg, char *errbuf,
|
||||
size_t errbuf_size));
|
||||
extern void regfree _RE_ARGS ((regex_t *preg));
|
||||
|
||||
|
|
Loading…
Reference in New Issue