From 308f7dea8b0c18e6b2c08057087e6805ab46761e Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 6 Jan 2011 08:53:42 +0000 Subject: mise en conformité de IvyMainLoop avec la version C --- Ivy/Ivy.sln | 14 ++++++++------ Ivy/IvyCbindings.cxx | 2 +- Ivy/IvyCbindings.h | 5 ++++- 3 files changed, 13 insertions(+), 8 deletions(-) (limited to 'Ivy') diff --git a/Ivy/Ivy.sln b/Ivy/Ivy.sln index 895d745..ef6f985 100644 --- a/Ivy/Ivy.sln +++ b/Ivy/Ivy.sln @@ -1,20 +1,22 @@ -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Ivy", "Ivy.vcproj", "{9818D652-CC05-463E-880D-AFCA2C7BFABE}" +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Ivy", "Ivy.vcxproj", "{9818D652-CC05-463E-880D-AFCA2C7BFABE}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pcre", "..\..\..\pcre\pcre.vcproj", "{D79FC143-498E-4342-B2C7-BDAD1B8D0E6B}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pcre", "..\..\..\pcre\pcre.vcxproj", "{D79FC143-498E-4342-B2C7-BDAD1B8D0E6B}" EndProject Global GlobalSection(SourceCodeControl) = preSolution SccNumberOfProjects = 2 - SccProjectUniqueName0 = Ivy.vcproj + SccProjectUniqueName0 = Ivy.vcxproj SccProjectName0 = \u0022$/Bus/Ivy\u0022,\u0020QPEAAAAA SccLocalPath0 = . SccProvider0 = MSSCCI:Microsoft\u0020Visual\u0020SourceSafe - SccProjectUniqueName1 = ..\\..\\..\\pcre\\pcre.vcproj + CanCheckoutShared = false + SccProjectUniqueName1 = ..\\..\\..\\pcre\\pcre.vcxproj SccProjectName1 = \u0022$/pcre\u0022,\u0020KSHAAAAA SccLocalPath1 = ..\\..\\..\\pcre SccProvider1 = MSSCCI:Microsoft\u0020Visual\u0020SourceSafe + CanCheckoutShared = false EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 diff --git a/Ivy/IvyCbindings.cxx b/Ivy/IvyCbindings.cxx index 8876bbf..722be71 100644 --- a/Ivy/IvyCbindings.cxx +++ b/Ivy/IvyCbindings.cxx @@ -123,7 +123,7 @@ void IvyBindDirectMsg( IvyCMsgDirectCallback callback, void *user_data) void IvySendDirectMsg( IvyClientPtr app, int id, char *msg ) { } -void IvyMainLoop( void(*hook)(void) ) +void IvyMainLoop() { Sleep( INFINITE ); } diff --git a/Ivy/IvyCbindings.h b/Ivy/IvyCbindings.h index 38ccfd6..1f65b5d 100644 --- a/Ivy/IvyCbindings.h +++ b/Ivy/IvyCbindings.h @@ -99,7 +99,10 @@ DLL_EXPORT int IvySendMsg( const char *fmt_message, ... ); /* avec sprintf prea DLL_EXPORT void IvyBindDirectMsg( IvyCMsgDirectCallback callback, void *user_data); DLL_EXPORT void IvySendDirectMsg( IvyClientPtr app, int id, char *msg ); -DLL_EXPORT void IvyMainLoop( void(*hook)(void) ); + +/* mainloop */ + +DLL_EXPORT void IvyMainLoop(); #ifdef __cplusplus } -- cgit v1.1