From 4d42efafcb4d2ffed6af12a1501f65beab3593aa Mon Sep 17 00:00:00 2001 From: bustico Date: Tue, 25 Jan 2011 17:34:23 +0000 Subject: fix some files so they can be compiled with g++ without warning(s) --- src/intervalRegexp.c | 4 ++-- src/ivybind.h | 8 ++++++++ src/ivyloop.h | 8 ++++---- 3 files changed, 14 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/intervalRegexp.c b/src/intervalRegexp.c index 1425df5..f5554a9 100644 --- a/src/intervalRegexp.c +++ b/src/intervalRegexp.c @@ -66,8 +66,8 @@ static bool perr (const char* func, const char *fmt, ...); */ int regexpGen (char *regexp, size_t buflen, long min, long max, int flottant) { - char *decimalPart = ""; - char *boundDecimalPart = ""; + const char *decimalPart = ""; + const char *boundDecimalPart = ""; char locBuf [8192] = "(?:"; diff --git a/src/ivybind.h b/src/ivybind.h index 44004dd..e815771 100644 --- a/src/ivybind.h +++ b/src/ivybind.h @@ -18,6 +18,10 @@ typedef struct _binding *IvyBinding; +#ifdef __cplusplus +extern "C" { +#endif + /* Mise en place des Filtrages */ int IvyBindingGetFilterCount(); void IvyBindingSetFilter( int argc, const char ** argv ); @@ -33,3 +37,7 @@ int IvyBindingExec( IvyBinding _bind, const char * message ); /* Get Argument */ void IvyBindingMatch( IvyBinding _bind, const char *message, int argnum, int *arglen, const char **arg ); +#ifdef __cplusplus +} +#endif + diff --git a/src/ivyloop.h b/src/ivyloop.h index 5639495..ff1b920 100644 --- a/src/ivyloop.h +++ b/src/ivyloop.h @@ -56,10 +56,10 @@ extern void IvyMainLoop(void); typedef void ( *IvyHookPtr) ( void *data ); -extern void IvyChannelAddWritableEvent(Channel channel); -extern void IvyChannelClearWritableEvent(Channel channel); -extern void IvySetBeforeSelectHook(IvyHookPtr before, void *data ); -extern void IvySetAfterSelectHook(IvyHookPtr after, void *data ); +void IvyChannelAddWritableEvent(Channel channel); +void IvyChannelClearWritableEvent(Channel channel); +void IvySetBeforeSelectHook(IvyHookPtr before, void *data ); +void IvySetAfterSelectHook(IvyHookPtr after, void *data ); #ifdef __cplusplus } -- cgit v1.1