ソースを参照

Fixes dependency on opener_user_conf.h

Removes commented include on opener_user_conf in opener_api.h
Made include dependent on lib mode in trace.h

Signed-off-by: Martin Melik-Merkumians <melik-merkumians@acin.tuwien.ac.at>
Martin Melik-Merkumians 6 年 前
コミット
afd1d1b7a0
2 ファイル変更4 行追加3 行削除
  1. 0 1
      source/src/opener_api.h
  2. 4 2
      source/src/trace.h

+ 0 - 1
source/src/opener_api.h

@@ -12,7 +12,6 @@
 #include "typedefs.h"
 #include "typedefs.h"
 #include "ciptypes.h"
 #include "ciptypes.h"
 #include "ciperror.h"
 #include "ciperror.h"
-//#include "opener_user_conf.h"
 
 
 /**  @defgroup CIP_API OpENer User interface
 /**  @defgroup CIP_API OpENer User interface
  * @brief This is the public interface of the OpENer. It provides all function
  * @brief This is the public interface of the OpENer. It provides all function

+ 4 - 2
source/src/trace.h

@@ -6,14 +6,16 @@
 #ifndef OPENER_TRACE_H_
 #ifndef OPENER_TRACE_H_
 #define OPENER_TRACE_H_
 #define OPENER_TRACE_H_
 
 
-//#include <opener_user_conf.h>
-
 /** @file trace.h
 /** @file trace.h
  * @brief Tracing infrastructure for OpENer
  * @brief Tracing infrastructure for OpENer
  */
  */
 
 
 #ifdef OPENER_WITH_TRACES
 #ifdef OPENER_WITH_TRACES
 
 
+#ifndef BUILD_SHARED_LIBS
+#include "opener_user_conf.h"
+#endif
+
 /** @def OPENER_TRACE_LEVEL_ERROR Enable tracing of error messages. This is the
 /** @def OPENER_TRACE_LEVEL_ERROR Enable tracing of error messages. This is the
  *  default if no trace level is given.
  *  default if no trace level is given.
  */
  */