From 8f47982e7d94bf31e6d71d7ee4365794974397a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Mon, 4 Jan 2010 05:41:53 +0000 Subject: [PATCH] added a list of SDL functions to wrap in windows version --- shmserver/shms-linux.cpp | 5 +---- shmserver/shms-windows.cpp | 42 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 4 deletions(-) diff --git a/shmserver/shms-linux.cpp b/shmserver/shms-linux.cpp index 1d8fc03df..5b8f11ce4 100644 --- a/shmserver/shms-linux.cpp +++ b/shmserver/shms-linux.cpp @@ -41,9 +41,6 @@ distribution. #include #include -// a full memory barrier! better be safe than sorry. -#define gcc_barrier asm volatile("" ::: "memory"); __sync_synchronize(); - /* * wait for futex * futex has to be aligned to 4 bytes @@ -120,7 +117,7 @@ void SHM_Init ( void ) errorstate = 1; return; } - gcc_barrier + full_barrier ((shm_cmd *)shm)->pingpong = DFPP_RUNNING; // make sure we don't stall or do crazy stuff } diff --git a/shmserver/shms-windows.cpp b/shmserver/shms-windows.cpp index b083ff69e..eeb57bea8 100644 --- a/shmserver/shms-windows.cpp +++ b/shmserver/shms-windows.cpp @@ -27,5 +27,47 @@ distribution. */ #include "shms.h" extern char *shm; +// SDL functions used in 40d16 +/* +SDL_AddTimer +SDL_CondSignal +SDL_CondWait +SDL_ConvertSurface +SDL_CreateCond +SDL_CreateMutex +SDL_CreateRGBSurface +SDL_CreateRGBSurfaceFrom +SDL_DestroyCond +SDL_DestroyMutex +SDL_EnableKeyRepeat +SDL_EnableUNICODE +SDL_FreeSurface +SDL_GL_GetAttribute +SDL_GL_SetAttribute +SDL_GL_SwapBuffers +SDL_GetError +SDL_GetKeyState +SDL_GetTicks +SDL_GetVideoInfo +SDL_Init +SDL_LockSurface +SDL_MapRGB +SDL_PollEvent +SDL_Quit +SDL_RWFromFile +SDL_RemoveTimer +SDL_SaveBMP_RW +SDL_SetAlpha +SDL_SetColorKey +SDL_SetModuleHandle +SDL_SetVideoMode +SDL_ShowCursor +SDL_UnlockSurface +SDL_UpperBlit +SDL_WM_SetCaption +SDL_WM_SetIcon +SDL_mutexP +SDL_strlcpy +*/ // TO BE DONE \ No newline at end of file