[PATCH 02/12] record: Guard config.h include

Sebastian Huber sebastian.huber at embedded-brains.de
Mon Mar 16 10:50:22 UTC 2020


Update #3904.
---
 trace/record/record-client-base.cc | 4 ++++
 trace/record/record-main-lttng.cc  | 2 ++
 trace/wscript                      | 3 ++-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/trace/record/record-client-base.cc b/trace/record/record-client-base.cc
index 8fe6edb..04c0ae8 100644
--- a/trace/record/record-client-base.cc
+++ b/trace/record/record-client-base.cc
@@ -25,6 +25,10 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "client.h"
 
 #ifdef _WIN32
diff --git a/trace/record/record-main-lttng.cc b/trace/record/record-main-lttng.cc
index a28de8e..2a4f509 100644
--- a/trace/record/record-main-lttng.cc
+++ b/trace/record/record-main-lttng.cc
@@ -26,7 +26,9 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
 
 #include "client.h"
 
diff --git a/trace/wscript b/trace/wscript
index 187ee82..38220a5 100644
--- a/trace/wscript
+++ b/trace/wscript
@@ -69,7 +69,8 @@ def build(bld):
     #
     # The list of defines
     #
-    defines = ['RTEMS_VERSION=\"%s\"' % (bld.env.RTEMS_VERSION),
+    defines = ['HAVE_CONFIG_H',
+               'RTEMS_VERSION=\"%s\"' % (bld.env.RTEMS_VERSION),
                'RTEMS_RELEASE=\"%s\"' % (bld.env.RTEMS_RELEASE)]
 
     #
-- 
2.16.4



More information about the devel mailing list