[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash/backend render_handler_ogl.cpp
From: |
Vitaly Alexeev |
Subject: |
[Gnash-commit] gnash/backend render_handler_ogl.cpp |
Date: |
Mon, 20 Nov 2006 15:05:53 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Vitaly Alexeev <alexeev> 06/11/20 15:05:53
Modified files:
backend : render_handler_ogl.cpp
Log message:
* server\parser\movie_def_impl.cpp: usleep(x) ==> Sleep(x/1000)
for win32,
'return _thread == 0' is invalid in win32 that 'pthread_t' is
typedef struct {
void * p; /* Pointer to actual object */
unsigned int x; /* Extra information - reuse count etc
*/
} ptw32_handle_t;
* server\video_stream_instance.h: typo
* gui\gui.cpp: typo
* backend\render_handler_ogl.cpp: GL/glx.h is absent in win32
* backend\sound_handler_sdl.cpp: sdl_audio_callback() is
switched off for win32
because of segmentation fault
* server\video_stream_instance.cpp: typo
* reconfigured win32 dir
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_ogl.cpp?cvsroot=gnash&r1=1.55&r2=1.56
Patches:
Index: render_handler_ogl.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/render_handler_ogl.cpp,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- render_handler_ogl.cpp 19 Nov 2006 22:24:09 -0000 1.55
+++ render_handler_ogl.cpp 20 Nov 2006 15:05:53 -0000 1.56
@@ -6,7 +6,7 @@
// A render_handler that uses SDL & OpenGL
-/* $Id: render_handler_ogl.cpp,v 1.55 2006/11/19 22:24:09 rsavoye Exp $ */
+/* $Id: render_handler_ogl.cpp,v 1.56 2006/11/20 15:05:53 alexeev Exp $ */
//#include "gnash.h"
#include "render_handler.h"
@@ -16,12 +16,13 @@
#include "utility.h"
#include "tu_opengl_includes.h"
-#include <GL/glx.h>
#include <cstring>
#include <cmath>
#if defined(_WIN32) || defined(WIN32)
-# include <Windows.h>
+ #include <Windows.h>
+#else
+ #include <GL/glx.h>
#endif
using namespace gnash;