Convert reporting from C to C++ (#3424)

project-chip · Nov 30, 2020 · c940fd3 · c940fd3
1 parent 0c22d2f
commit c940fd3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/...porting/reporting-default-configuration.c → ...rting/reporting-default-configuration.cpp b/...porting/reporting-default-configuration.c → ...rting/reporting-default-configuration.cpp
diff --git a/src/app/reporting/reporting.c → src/app/reporting/reporting.cpp b/src/app/reporting/reporting.c → src/app/reporting/reporting.cpp
@@ -153,7 +153,7 @@ void emberAfPluginReportingStackStatusCallback(EmberStatus status)
     }
 }
 
-void emberAfPluginReportingInitCallback(void)
+extern "C" void emberAfPluginReportingInitCallback(void)
 {
     // On device initialization, any attributes that have been set up to report
     // should generate an attribute report.
@@ -171,7 +171,7 @@ void emberAfPluginReportingInitCallback(void)
     scheduleTick();
 }
 
-void emberAfPluginReportingTickEventHandler(void)
+extern "C" void emberAfPluginReportingTickEventHandler(void)
 {
     EmberApsFrame * apsFrame = NULL;
     EmberAfStatus status;

diff --git a/src/app/util/types_stub.h b/src/app/util/types_stub.h
@@ -1963,10 +1963,6 @@ typedef struct
 #define emberAfPluginColorControlServerComputePwmFromHsvCallback(endpoint) (void) 0
 #define emberAfPluginColorControlServerComputePwmFromTempCallback(endpoint) (void) 0
 
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
-
 /**
  * @brief Macro that copies the token value from non-volatile storage into a RAM
  * location.  This macro can only be used with tokens that are defined using
@@ -2002,4 +1998,8 @@ typedef struct
 
 uint32_t halCommonGetInt32uMillisecondTick(void);
 
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
+
 #endif // TYPES_STUB_H