diff options
| author | pbos@webrtc.org <pbos@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-05-21 13:52:32 +0000 |
|---|---|---|
| committer | pbos@webrtc.org <pbos@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-05-21 13:52:32 +0000 |
| commit | 956aa7e0874f2e08c335a82a2c32f400fac8b031 (patch) | |
| tree | 2217e5cc76bd6d5c1ade26239fc687221bd69d42 /webrtc/voice_engine/voice_engine_defines.h | |
| parent | 8a025e26db985a128023f43dfa6abc7b9c2d1a72 (diff) | |
| download | webrtc-956aa7e0874f2e08c335a82a2c32f400fac8b031.tar.gz | |
Include files from webrtc/.. paths in voice_engine/
BUG=1662
R=henrikg@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/1434005
git-svn-id: http://webrtc.googlecode.com/svn/trunk@4079 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'webrtc/voice_engine/voice_engine_defines.h')
| -rw-r--r-- | webrtc/voice_engine/voice_engine_defines.h | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/webrtc/voice_engine/voice_engine_defines.h b/webrtc/voice_engine/voice_engine_defines.h index cb63940dfd..ffb9c24e4e 100644 --- a/webrtc/voice_engine/voice_engine_defines.h +++ b/webrtc/voice_engine/voice_engine_defines.h @@ -255,28 +255,28 @@ inline int VoEChannelId(int moduleId) #ifdef WEBRTC_LINUX +#include <arpa/inet.h> +#include <netinet/in.h> #include <pthread.h> -#include <sys/types.h> #include <sys/socket.h> -#include <netinet/in.h> -#include <arpa/inet.h> +#include <sys/types.h> #ifndef QNX #include <linux/net.h> #ifndef ANDROID #include <sys/soundcard.h> #endif // ANDROID #endif // QNX -#include <stdio.h> -#include <string.h> -#include <stdlib.h> #include <errno.h> -#include <sys/stat.h> -#include <sys/ioctl.h> -#include <unistd.h> #include <fcntl.h> #include <sched.h> -#include <time.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <sys/ioctl.h> +#include <sys/stat.h> #include <sys/time.h> +#include <time.h> +#include <unistd.h> #define DWORD unsigned long int #define WINAPI @@ -339,22 +339,22 @@ inline int VoEChannelId(int moduleId) #ifdef WEBRTC_MAC -#include <pthread.h> -#include <sys/types.h> -#include <sys/socket.h> -#include <netinet/in.h> +#include <AudioUnit/AudioUnit.h> #include <arpa/inet.h> -#include <stdio.h> -#include <string.h> -#include <stdlib.h> #include <errno.h> -#include <sys/stat.h> -#include <unistd.h> #include <fcntl.h> +#include <netinet/in.h> +#include <pthread.h> #include <sched.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <sys/socket.h> +#include <sys/stat.h> #include <sys/time.h> +#include <sys/types.h> #include <time.h> -#include <AudioUnit/AudioUnit.h> +#include <unistd.h> #if !defined(WEBRTC_IOS) #include <CoreServices/CoreServices.h> #include <CoreAudio/CoreAudio.h> |