Merge pull request #795 from pabuhler/config-h-include

be consistent with config.h include

Author: pabuhler

include/srtp_priv.h

@@ -46,7 +46,9 @@
 #define SRTP_PRIV_H
 
 // Leave this as the top level import. Ensures the existence of defines
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include "srtp.h"
 #include "rdbx.h"

srtp/srtp.c

@@ -42,9 +42,6 @@
  *
  */
 
-// Leave this as the top level import. Ensures the existence of defines
-#include "config.h"
-
 #include "srtp_priv.h"
 #include "stream_list_priv.h"
 #include "crypto_types.h"

test/rtp.h

@@ -53,14 +53,14 @@
 #ifndef SRTP_RTP_H
 #define SRTP_RTP_H
 
+#include "srtp_priv.h"
+
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #elif defined HAVE_WINSOCK2_H
 #include <winsock2.h>
 #endif
 
-#include "srtp_priv.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif

test/util.c

@@ -42,7 +42,10 @@
  *
  */
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "util.h"
 
 #include <string.h>