Assuming, just because it is MSVC, that the standard integers are not defined, is...

diff --git a/libs/esl/src/include/esl.h b/libs/esl/src/include/esl.h
index 4296175f3a18861931d17039161b7c1239e58bd0..5e66fe437a0bb51494e53c7cb39670ff7fd9b341 100644 (file)
--- a/libs/esl/src/include/esl.h
+++ b/libs/esl/src/include/esl.h
@@ -221,6 +221,7 @@ typedef enum {
 #include <winsock2.h>
 #include <windows.h>
 typedef SOCKET esl_socket_t;
+#if !defined(_STDINT) && !defined(uint32_t)
 typedef unsigned __int64 uint64_t;
 typedef unsigned __int32 uint32_t;
 typedef unsigned __int16 uint16_t;
@@ -229,6 +230,7 @@ typedef __int64 int64_t;
 typedef __int32 int32_t;
 typedef __int16 int16_t;
 typedef __int8 int8_t;
+#endif
 typedef intptr_t esl_ssize_t;
 typedef int esl_filehandle_t;
 #define ESL_SOCK_INVALID INVALID_SOCKET

diff --git a/libs/libdingaling/src/ldl_compat.h b/libs/libdingaling/src/ldl_compat.h
index 2507cd59575c6f96551b176949c3449dd4178159..280bf20dc8a0069a30d2ee86d6bc010df4350c9e 100644 (file)
--- a/libs/libdingaling/src/ldl_compat.h
+++ b/libs/libdingaling/src/ldl_compat.h
@@ -42,7 +42,7 @@ extern "C" {
 
 
 #ifdef _MSC_VER
-#ifndef uint32_t
+#if !defined(_STDINT) && !defined(uint32_t)
 typedef unsigned __int8                uint8_t;
 typedef unsigned __int16       uint16_t;
 typedef unsigned __int32       uint32_t;

diff --git a/libs/libteletone/src/libteletone_generate.h b/libs/libteletone/src/libteletone_generate.h
index a49e45a658b62e589351fbc74c3ffe4c0c81dd97..25d5bf79d75d8cee053a51aaff381141deccc66c 100644 (file)
--- a/libs/libteletone/src/libteletone_generate.h
+++ b/libs/libteletone/src/libteletone_generate.h
@@ -91,6 +91,7 @@ extern "C" {
 #define __inline__ __inline
 #endif
 
+#if !defined(_STDINT) && !defined(uint32_t)
 typedef unsigned __int64 uint64_t;
 typedef unsigned __int32 uint32_t;
 typedef unsigned __int16 uint16_t;
@@ -99,6 +100,7 @@ typedef __int64 int64_t;
 typedef __int32 int32_t;
 typedef __int16 int16_t;
 typedef __int8 int8_t;
+#endif
 #else
 #include <stdint.h>
 #endif

diff --git a/libs/stfu/stfu.h b/libs/stfu/stfu.h
index 2b214191185468e790e6cd6f81283e38aaca959d..045b6440095a00a0eee729ea99320c50121ae2bb 100644 (file)
--- a/libs/stfu/stfu.h
+++ b/libs/stfu/stfu.h
@@ -49,7 +49,7 @@ extern "C" {
 #endif
 
 #ifdef  _MSC_VER
-#ifndef uint32_t
+#if !defined(_STDINT) && !defined(uint32_t)
 typedef unsigned __int8     uint8_t;
 typedef unsigned __int16    uint16_t;
 typedef unsigned __int32    uint32_t;

diff --git a/libs/unimrcp/libs/mpf/codecs/g711/g711.h b/libs/unimrcp/libs/mpf/codecs/g711/g711.h
index a8a0e921504ca77b1388b271df654f9b83d4e4e9..ae7e0e44aa85b2fe08ddb4dc9693e000ddaa3786 100644 (file)
--- a/libs/unimrcp/libs/mpf/codecs/g711/g711.h
+++ b/libs/unimrcp/libs/mpf/codecs/g711/g711.h
@@ -49,11 +49,13 @@ extern "C" {
 #ifndef __inline__
 #define __inline__ __inline
 #endif
+#if !defined(_STDINT) && !defined(uint32_t)
 typedef unsigned __int8 uint8_t;
 typedef __int16 int16_t;
 typedef __int32 int32_t;
 typedef unsigned __int16 uint16_t;
 #endif
+#endif
 
 #if defined(__i386__)
 /*! \brief Find the bit position of the highest set bit in a word

diff --git a/src/include/g711.h b/src/include/g711.h
index 53f3afc87e89dd79904d27a7bc93e6928d50fcb6..aac82a15accde486328b118b8d6d665c9e730bc6 100644 (file)
--- a/src/include/g711.h
+++ b/src/include/g711.h
@@ -50,11 +50,13 @@ extern "C" {
 #ifndef __inline__
 #define __inline__ __inline
 #endif
+#if !defined(_STDINT) && !defined(uint32_t)
        typedef unsigned __int8 uint8_t;
        typedef __int16 int16_t;
        typedef __int32 int32_t;
        typedef unsigned __int16 uint16_t;
 #endif
+#endif
 
 #if defined(__i386__)
 /*! \brief Find the bit position of the highest set bit in a word

diff --git a/src/include/switch_platform.h b/src/include/switch_platform.h
index a01185074896fb8a5c9b677ed4204dd9f7a42594..1140aac8ba3a73629c45337d0f80ffde672e7cb9 100644 (file)
--- a/src/include/switch_platform.h
+++ b/src/include/switch_platform.h
@@ -88,7 +88,7 @@ SWITCH_BEGIN_EXTERN_C
 #endif
 #undef inline
 #define inline __inline
-#ifndef uint32_t
+#if !defined(_STDINT) && !defined(uint32_t)
 typedef unsigned __int8 uint8_t;
 typedef unsigned __int16 uint16_t;
 typedef unsigned __int32 uint32_t;

diff --git a/src/mod/endpoints/mod_opal/mod_opal.h b/src/mod/endpoints/mod_opal/mod_opal.h
index da2ea1fa5b1a0a831e54c26652aca240ca2de4e1..56ac9b3671a23fee98d5a0de4491e0eedd58301e 100644 (file)
--- a/src/mod/endpoints/mod_opal/mod_opal.h
+++ b/src/mod/endpoints/mod_opal/mod_opal.h
@@ -49,31 +49,7 @@
 #undef strcasecmp\r
 #undef strncasecmp\r
 \r
-\r
-#ifdef _MSC_VER\r
-/*The following insanity is because libteletone_generate.h defines int8_t in\r
-  a slightly different manner to most other cases (SDL, PCAP, Java V8,\r
-  VS2010's own stdint.h, etc) and does not provide a mechanism to prevent it's\r
-  inclusion. Then, to cap it off, MSVC barfs on the difference.\r
-\r
-  Sigh.\r
- */\r
-#pragma include_alias(<libteletone.h>,          <../../libs/libteletone/src/libteletone.h>)\r
-#pragma include_alias(<libteletone_generate.h>, <../../libs/libteletone/src/libteletone_generate.h>)\r
-#pragma include_alias(<libteletone_detect.h>,   <../../libs/libteletone/src/libteletone_detect.h>)\r
-#define int8_t signed int8_t\r
-#include <libteletone_generate.h>\r
-#undef int8_t\r
-#endif // End of insanity\r
-\r
-\r
-#define HAVE_APR\r
-#define uint32_t uint32_t // Avoid conflict in stdint definitions\r
 #include <switch.h>\r
-#undef uint32_t\r
-\r
-#include <switch_version.h>\r
-\r
 \r
 #define MODNAME "mod_opal"\r
 \r