Bug 1230759: Part 4 - added missing ifdef's draft
authorNils Ohlmeier [:drno] <drno@ohlmeier.org>
Wed, 08 Nov 2017 21:38:12 -0800
changeset 696861 72047f08228fe84e754155b982c59972306ed3b8
parent 696860 65224193fdf0c07365262869f63eabccfe13b139
child 696862 8cd8e250b49f1a507f985dd28e23982be83a7477
push id88810
push userdrno@ohlmeier.org
push dateSun, 12 Nov 2017 02:22:41 +0000
bugs1230759
milestone58.0a1
Bug 1230759: Part 4 - added missing ifdef's MozReview-Commit-ID: JUMNIBcsu4S
netwerk/srtp/src/include/srtp_priv.h
netwerk/srtp/src/srtp/srtp.c
--- a/netwerk/srtp/src/include/srtp_priv.h
+++ b/netwerk/srtp/src/include/srtp_priv.h
@@ -41,17 +41,19 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  */
 
 #ifndef SRTP_PRIV_H
 #define SRTP_PRIV_H
 
 // Leave this as the top level import. Ensures the existence of defines
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
 
 #include "srtp.h"
 #include "rdbx.h"
 #include "rdb.h"
 #include "integers.h"
 #include "cipher.h"
 #include "auth.h"
 #include "aes.h"
--- a/netwerk/srtp/src/srtp/srtp.c
+++ b/netwerk/srtp/src/srtp/srtp.c
@@ -38,17 +38,19 @@
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  */
 
 // Leave this as the top level import. Ensures the existence of defines
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
 
 #include "srtp_priv.h"
 #include "crypto_types.h"
 #include "err.h"
 #include "ekt.h"   /* for SRTP Encrypted Key Transport */
 #include "alloc.h" /* for srtp_crypto_alloc() */
 
 #ifdef OPENSSL