Commit fd65d840 authored by Simon Morlat's avatar Simon Morlat
Browse files

Merge branch 'master' of git.linphone.org:ortp-private

parents 5c64cbd8 f17c3785
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#if defined(WIN32) || defined(_WIN32_WCE) #if defined(WIN32) || defined(_WIN32_WCE)
#include "ortp-config-win32.h" #include "ortp-config-win32.h"
#else #elif HAVE_CONFIG_H
#include "ortp-config.h" #include "ortp-config.h"
#endif #endif
#include "ortp/ortp.h" #include "ortp/ortp.h"
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#if defined(WIN32) || defined(_WIN32_WCE) #if defined(WIN32) || defined(_WIN32_WCE)
#include "ortp-config-win32.h" #include "ortp-config-win32.h"
#else #elif HAVE_CONFIG_H
#include "ortp-config.h" #include "ortp-config.h"
#endif #endif
#include "ortp/port.h" #include "ortp/port.h"
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#if defined(WIN32) || defined(_WIN32_WCE) #if defined(WIN32) || defined(_WIN32_WCE)
#include "ortp-config-win32.h" #include "ortp-config-win32.h"
#else #elif HAVE_CONFIG_H
#include "ortp-config.h" #include "ortp-config.h"
#endif #endif
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#if defined(WIN32) || defined(_WIN32_WCE) #if defined(WIN32) || defined(_WIN32_WCE)
#include "ortp-config-win32.h" #include "ortp-config-win32.h"
#else #elif HAVE_CONFIG_H
#include "ortp-config.h" #include "ortp-config.h"
#endif #endif
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#if defined(WIN32) || defined(_WIN32_WCE) #if defined(WIN32) || defined(_WIN32_WCE)
#include "ortp-config-win32.h" #include "ortp-config-win32.h"
#else #elif HAVE_CONFIG_H
#include "ortp-config.h" /*needed for HAVE_SYS_UIO_H */ #include "ortp-config.h" /*needed for HAVE_SYS_UIO_H */
#endif #endif
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#if defined(_MSC_VER) && (defined(WIN32) || defined(_WIN32_WCE)) #if defined(_MSC_VER) && (defined(WIN32) || defined(_WIN32_WCE))
#include "ortp-config-win32.h" #include "ortp-config-win32.h"
#else #elif HAVE_CONFIG_H
#include "ortp-config.h" #include "ortp-config.h"
#endif #endif
#include "ortp/ortp.h" #include "ortp/ortp.h"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment