repositories
/
deb_libcec.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
posix: fixed lib/platform/sockets/tcp.h compilation and some bugs. added CTcpSocket...
[deb_libcec.git]
/
src
/
lib
/
platform
/
windows
/
os-types.h
diff --git
a/src/lib/platform/windows/os-types.h
b/src/lib/platform/windows/os-types.h
index 0a61c2e2d6d4089b2b39aa6a7525588c02b67839..de12f08426095313fd7ef233cc19737e24e6a729 100644
(file)
--- a/
src/lib/platform/windows/os-types.h
+++ b/
src/lib/platform/windows/os-types.h
@@
-2,7
+2,7
@@
/*
* This file is part of the libCEC(R) library.
*
/*
* This file is part of the libCEC(R) library.
*
- * libCEC(R) is Copyright (C) 2011 Pulse-Eight Limited. All rights reserved.
+ * libCEC(R) is Copyright (C) 2011
-2012
Pulse-Eight Limited. All rights reserved.
* libCEC(R) is an original work, containing original code.
*
* libCEC(R) is a trademark of Pulse-Eight Limited.
* libCEC(R) is an original work, containing original code.
*
* libCEC(R) is a trademark of Pulse-Eight Limited.
@@
-35,6
+35,10
@@
#define __WINDOWS__
#endif
#define __WINDOWS__
#endif
+#ifndef _WINSOCKAPI_
+#define _WINSOCKAPI_
+#endif
+
#pragma warning(disable:4005) // Disable "warning C4005: '_WINSOCKAPI_' : macro redefinition"
#include <winsock2.h>
#pragma warning(default:4005)
#pragma warning(disable:4005) // Disable "warning C4005: '_WINSOCKAPI_' : macro redefinition"
#include <winsock2.h>
#pragma warning(default:4005)
@@
-46,6
+50,8
@@
#include <stddef.h>
#include <process.h>
#include <stddef.h>
#include <process.h>
+typedef SOCKET socket_t;
+
typedef signed __int8 int8_t;
typedef signed __int16 int16_t;
typedef signed __int32 int32_t;
typedef signed __int8 int8_t;
typedef signed __int16 int16_t;
typedef signed __int32 int32_t;
@@
-57,8
+63,6
@@
typedef unsigned __int64 uint64_t;
#define snprintf _snprintf
#define snprintf _snprintf
-typedef SOCKET socket_t;
-
#if defined(_MSC_VER)
#pragma warning (push)
#endif
#if defined(_MSC_VER)
#pragma warning (push)
#endif