[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash/libbase log.cpp network.cpp network.h tu_...
From: |
Vitaly Alexeev |
Subject: |
[Gnash-commit] gnash/libbase log.cpp network.cpp network.h tu_... |
Date: |
Fri, 27 Oct 2006 14:29:02 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Vitaly Alexeev <alexeev> 06/10/27 14:29:02
Modified files:
libbase : log.cpp network.cpp network.h tu_types.h
Log message:
videostream implementation
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/log.cpp?cvsroot=gnash&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/network.cpp?cvsroot=gnash&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/network.h?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/tu_types.h?cvsroot=gnash&r1=1.29&r2=1.30
Patches:
Index: log.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/log.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- log.cpp 20 Oct 2006 10:26:47 -0000 1.32
+++ log.cpp 27 Oct 2006 14:29:02 -0000 1.33
@@ -36,7 +36,7 @@
//
//
-/* $Id: log.cpp,v 1.32 2006/10/20 10:26:47 strk Exp $ */
+/* $Id: log.cpp,v 1.33 2006/10/27 14:29:02 alexeev Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -63,11 +63,16 @@
#endif
#include <ctime>
#define BOOST_HAS_THREADS 1
-#include <boost/detail/lightweight_mutex.hpp>
-using boost::detail::lightweight_mutex;
-#define scoped_lock lightweight_mutex::scoped_lock
-static lightweight_mutex io_mutex;
+#if defined(_WIN32) || defined(WIN32)
+#define lock(io_mutex) ;
+#define scoped_lock ;
+#else
+ #include <boost/detail/lightweight_mutex.hpp>
+ using boost::detail::lightweight_mutex;
+ #define scoped_lock lightweight_mutex::scoped_lock
+ static lightweight_mutex io_mutex;
+#endif
#include "log.h"
Index: network.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/network.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- network.cpp 25 Sep 2006 00:20:55 -0000 1.13
+++ network.cpp 27 Oct 2006 14:29:02 -0000 1.14
@@ -50,7 +50,7 @@
#include <cerrno>
#include <fcntl.h>
#ifdef HAVE_WINSOCK_H
-# include <winsock2.h>
+// # include <winsock2.h>
# include <windows.h>
# include <sys/stat.h>
# include <io.h>
Index: network.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/network.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- network.h 17 Sep 2006 19:45:59 -0000 1.8
+++ network.h 27 Oct 2006 14:29:02 -0000 1.9
@@ -50,7 +50,7 @@
# include <netinet/in.h>
# include <arpa/inet.h>
#else
-# include <winsock2.h>
+// # include <winsock2.h>
# include <windows.h>
# include <fcntl.h>
# include <sys/stat.h>
Index: tu_types.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/tu_types.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- tu_types.h 17 Oct 2006 22:57:58 -0000 1.29
+++ tu_types.h 27 Oct 2006 14:29:02 -0000 1.30
@@ -35,7 +35,7 @@
//
//
-/* $Id: tu_types.h,v 1.29 2006/10/17 22:57:58 nihilus Exp $ */
+/* $Id: tu_types.h,v 1.30 2006/10/27 14:29:02 alexeev Exp $ */
#ifndef TU_TYPES_H
#define TU_TYPES_H
@@ -48,19 +48,19 @@
#include "tu_config.h"
#if defined(_WIN32) || defined(WIN32)
-typedef unsigned char uint8_t;
-typedef char int8_t;
-typedef unsigned short int uint16_t;
-typedef short int int16_t;
-typedef unsigned int uint32_t;
-typedef int int32_t;
-typedef unsigned __int64 uint64_t;
-typedef __int64 int64_t;
+#include <sdl_stdinc.h>
+//typedef unsigned char uint8_t;
+//typedef char int8_t;
+//typedef unsigned short int uint16_t;
+//typedef short int int16_t;
+//typedef unsigned int uint32_t;
+//typedef int int32_t;
+//typedef unsigned __int64 uint64_t;
+//typedef __int64 int64_t;
# define __PRETTY_FUNCTION__ __FUNCDNAME__
# define BYTE_ORDER SDL_BYTEORDER
#else
# include <inttypes.h>
-#endif
#ifndef HAVE_FUNCTION
#ifndef HAVE_func
@@ -76,6 +76,8 @@
#define __PRETTY_FUNCTION__ __FUNCTION__
#endif
+#endif
+
#ifndef BYTE_ORDER
#ifdef HAVE_ENDIAN_H
#include <endian.h>
- [Gnash-commit] gnash/libbase log.cpp network.cpp network.h tu_...,
Vitaly Alexeev <=