diff options
| author | Steve Bennett <steveb@workware.net.au> | 2010-01-24 10:16:56 +1000 |
|---|---|---|
| committer | Steve Bennett <steveb@workware.net.au> | 2010-10-15 11:02:38 +1000 |
| commit | c7527a0ba18bccd34d9653f681bad80c25a2e9af (patch) | |
| tree | 7ef8b256d2d5c1233fffad016dff558d867679d3 /jim-eventloop.h | |
| parent | 6e7b3dd60ce7b54e0937fef48b889296fdcfab09 (diff) | |
| download | jimtcl-c7527a0ba18bccd34d9653f681bad80c25a2e9af.zip jimtcl-c7527a0ba18bccd34d9653f681bad80c25a2e9af.tar.gz jimtcl-c7527a0ba18bccd34d9653f681bad80c25a2e9af.tar.bz2 | |
Simplify use of eventloop
Just assume direct static linking for now
Diffstat (limited to 'jim-eventloop.h')
| -rw-r--r-- | jim-eventloop.h | 45 |
1 files changed, 5 insertions, 40 deletions
diff --git a/jim-eventloop.h b/jim-eventloop.h index e09170e..39be1c2 100644 --- a/jim-eventloop.h +++ b/jim-eventloop.h @@ -63,52 +63,17 @@ typedef void Jim_EventFinalizerProc(Jim_Interp *interp, void *clientData); #define JIM_EVENT_EXCEPTION 4 #define JIM_EVENT_FEOF 8 -#ifndef __JIM_EVENTLOOP_CORE__ -# if defined JIM_EXTENSION || defined JIM_EMBEDDED -# define JIM_API(x) (*x) -# define JIM_STATIC -# else -# define JIM_API(x) (*x) -# define JIM_STATIC extern -# endif -#else -# define JIM_API(x) x -# define JIM_STATIC static -#endif /* __JIM_EVENTLOOP_CORE__ */ - -JIM_STATIC void JIM_API(Jim_CreateFileHandler) (Jim_Interp *interp, +JIM_EXPORT void Jim_CreateFileHandler (Jim_Interp *interp, void *handle, int mask, Jim_FileProc *proc, void *clientData, Jim_EventFinalizerProc *finalizerProc); -JIM_STATIC void JIM_API(Jim_DeleteFileHandler) (Jim_Interp *interp, +JIM_EXPORT void Jim_DeleteFileHandler (Jim_Interp *interp, void *handle); -JIM_STATIC jim_wide JIM_API(Jim_CreateTimeHandler) (Jim_Interp *interp, +JIM_EXPORT jim_wide Jim_CreateTimeHandler (Jim_Interp *interp, jim_wide milliseconds, Jim_TimeProc *proc, void *clientData, Jim_EventFinalizerProc *finalizerProc); -JIM_STATIC jim_wide JIM_API(Jim_DeleteTimeHandler) (Jim_Interp *interp, jim_wide id); -JIM_STATIC int JIM_API(Jim_ProcessEvents) (Jim_Interp *interp, int flags); - -#undef JIM_STATIC -#undef JIM_API - -#ifndef __JIM_EVENTLOOP_CORE__ - -#define JIM_GET_API(name) \ - Jim_GetApi(interp, "Jim_" #name, ((void *)&Jim_ ## name)) - -#if defined(JIM_EXTENSION) || defined(JIM_EMBEDDED) -/* This must be included "inline" inside the extension */ -static void Jim_ImportEventloopAPI(Jim_Interp *interp) -{ - JIM_GET_API(CreateFileHandler); - JIM_GET_API(DeleteFileHandler); - JIM_GET_API(CreateTimeHandler); - JIM_GET_API(DeleteTimeHandler); - JIM_GET_API(ProcessEvents); -} -#endif /* defined JIM_EXTENSION || defined JIM_EMBEDDED */ -#undef JIM_GET_API -#endif /* __JIM_EVENTLOOP_CORE__ */ +JIM_EXPORT jim_wide Jim_DeleteTimeHandler (Jim_Interp *interp, jim_wide id); +JIM_EXPORT int Jim_ProcessEvents (Jim_Interp *interp, int flags); #endif /* __JIM_EVENTLOOP_H__ */ |