From e20b46a85ba9597fa36260aa82dad77cb55164e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Wed, 21 Dec 2022 09:55:29 -0500
Subject: [PATCH] build: add missing HAVE_CONFIG_H
Support building without config.h if the build system supports it.
Currently, some file have a config.h header guard and some files don't.
Make sure all files use the config.h header guard.
Change-Id: I461255f8d3773d47e8dc19fff9f2a12b3cab1965
---
src/debug_utils.h | 2 --
src/im/instant_messaging.h | 2 ++
src/jami/tracepoint-def.h | 5 +++--
src/media/media_buffer.h | 3 +++
src/media/media_decoder.h | 2 ++
src/media/media_encoder.h | 7 +++----
src/media/media_filter.h | 3 +++
src/media/media_recorder.h | 2 ++
src/media/video/accel.cpp | 5 ++++-
9 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/src/debug_utils.h b/src/debug_utils.h
index 25238219d8..ea3fcbdf35 100644
--- a/src/debug_utils.h
+++ b/src/debug_utils.h
@@ -20,8 +20,6 @@
#pragma once
-#include "config.h"
-
#include "libav_deps.h"
#include "media_io_handle.h"
#include "system_codec_container.h"
diff --git a/src/im/instant_messaging.h b/src/im/instant_messaging.h
index d24c76694b..fcef32eca8 100644
--- a/src/im/instant_messaging.h
+++ b/src/im/instant_messaging.h
@@ -28,7 +28,9 @@
#include <list>
#include <stdexcept>
+#ifdef HAVE_CONFIG_H
#include "config.h"
+#endif
extern "C" {
struct pjsip_inv_session;
diff --git a/src/jami/tracepoint-def.h b/src/jami/tracepoint-def.h
index cb812f6eee..ed584c2957 100644
--- a/src/jami/tracepoint-def.h
+++ b/src/jami/tracepoint-def.h
@@ -1,6 +1,7 @@
-#include "config.h"
-
#ifdef ENABLE_TRACEPOINTS
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
#undef LTTNG_UST_TRACEPOINT_PROVIDER
#define LTTNG_UST_TRACEPOINT_PROVIDER jami
diff --git a/src/media/media_buffer.h b/src/media/media_buffer.h
index 93062e9087..5af829a422 100644
--- a/src/media/media_buffer.h
+++ b/src/media/media_buffer.h
@@ -20,7 +20,10 @@
#pragma once
+#ifdef HAVE_CONFIG_H
#include "config.h"
+#endif
+
#include "videomanager_interface.h"
#include "observer.h"
diff --git a/src/media/media_decoder.h b/src/media/media_decoder.h
index 34c22e398c..df33e1953b 100644
--- a/src/media/media_decoder.h
+++ b/src/media/media_decoder.h
@@ -19,7 +19,9 @@
*/
#pragma once
+#ifdef HAVE_CONFIG_H
#include "config.h"
+#endif
#include "rational.h"
#include "observer.h"
diff --git a/src/media/media_encoder.h b/src/media/media_encoder.h
index 9c309491e7..422d11f7c6 100644
--- a/src/media/media_encoder.h
+++ b/src/media/media_encoder.h
@@ -19,10 +19,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef __MEDIA_ENCODER_H__
-#define __MEDIA_ENCODER_H__
+#pragma once
+#ifdef HAVE_CONFIG_H
#include "config.h"
+#endif
#ifdef ENABLE_VIDEO
#include "video/video_base.h"
@@ -183,5 +184,3 @@ protected:
};
} // namespace jami
-
-#endif // __MEDIA_ENCODER_H__
diff --git a/src/media/media_filter.h b/src/media/media_filter.h
index d9c6cc452f..1b46413bdd 100644
--- a/src/media/media_filter.h
+++ b/src/media/media_filter.h
@@ -20,7 +20,10 @@
#pragma once
+#ifdef HAVE_CONFIG_H
#include "config.h"
+#endif
+
#include "media_stream.h"
#include "noncopyable.h"
diff --git a/src/media/media_recorder.h b/src/media/media_recorder.h
index e3da21d57a..2f7cbf4edf 100644
--- a/src/media/media_recorder.h
+++ b/src/media/media_recorder.h
@@ -20,7 +20,9 @@
#pragma once
+#ifdef HAVE_CONFIG_H
#include "config.h"
+#endif
#include "media_buffer.h"
#include "media_encoder.h"
#include "media_filter.h"
diff --git a/src/media/video/accel.cpp b/src/media/video/accel.cpp
index 314ca8696d..b95f7bec0e 100644
--- a/src/media/video/accel.cpp
+++ b/src/media/video/accel.cpp
@@ -21,12 +21,15 @@
#include <algorithm>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "media_buffer.h"
#include "string_utils.h"
#include "fileutils.h"
#include "logger.h"
#include "accel.h"
-#include "config.h"
namespace jami {
namespace video {
--
GitLab