mlaz closed pull request #833: fixing sr_from_macro global symbol conflict
URL: https://github.com/apache/mynewt-core/pull/833
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/hw/mcu/nordic/include/nrfx_glue.h
b/hw/mcu/nordic/include/nrfx_glue.h
index ba245e3a1..ef8dd8410 100644
--- a/hw/mcu/nordic/include/nrfx_glue.h
+++ b/hw/mcu/nordic/include/nrfx_glue.h
@@ -97,7 +97,7 @@ extern "C" {
/**
* @brief Macro for entering into a critical section.
*/
-os_sr_t sr_from_macro;
+static os_sr_t sr_from_macro __attribute__((unused));
#define NRFX_CRITICAL_SECTION_ENTER() OS_ENTER_CRITICAL(sr_from_macro);
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
