Author: dhudson
Date: 2006-08-10 14:00:52 -0400 (Thu, 10 Aug 2006)
New Revision: 63611
Modified:
trunk/tao/src/Tao.Sdl/Makefile.am
trunk/tao/src/Tao.Sdl/Sdl.cs
Log:
fix geterror and clean files better
Modified: trunk/tao/src/Tao.Sdl/Makefile.am
===================================================================
--- trunk/tao/src/Tao.Sdl/Makefile.am 2006-08-10 17:32:11 UTC (rev 63610)
+++ trunk/tao/src/Tao.Sdl/Makefile.am 2006-08-10 18:00:52 UTC (rev 63611)
@@ -37,7 +37,7 @@
$(CSFLAGS) \
$(BUILD_FILES)
-CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb $(ASSEMBLY).xml $(ASSEMBLY).pdb
+CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb $(ASSEMBLY_NAME).pdb
$(ASSEMBLY_NAME).xml
EXTRA_DIST = \
$(FILES) \
Tao.Sdl.snk \
Modified: trunk/tao/src/Tao.Sdl/Sdl.cs
===================================================================
--- trunk/tao/src/Tao.Sdl/Sdl.cs 2006-08-10 17:32:11 UTC (rev 63610)
+++ trunk/tao/src/Tao.Sdl/Sdl.cs 2006-08-10 18:00:52 UTC (rev 63611)
@@ -6946,8 +6946,14 @@
/// <code>extern DECLSPEC char * SDLCALL
SDL_GetError(void)</code>
/// </p>
/// </remarks>
- [DllImport(SDL_NATIVE_LIBRARY,
CallingConvention=CALLING_CONVENTION), SuppressUnmanagedCodeSecurity]
- public static extern string SDL_GetError();
+ public static string SDL_GetError()
+ {
+ return Marshal.PtrToStringAnsi(__SDL_GetError());
+ }
+
+ // Called from SDL_GetError()
+ [DllImport(SDL_NATIVE_LIBRARY,
CallingConvention=CALLING_CONVENTION, EntryPoint="SDL_GetError"),
SuppressUnmanagedCodeSecurity]
+ private static extern IntPtr __SDL_GetError();
#endregion string SDL_GetError()
#region SDL_ClearError()
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
