Remove duplicate provider name checks

[lttng-ust.git] / include / lttng / ust-tracepoint-event.h

diff --git a/include/lttng/ust-tracepoint-event.h b/include/lttng/ust-tracepoint-event.h
index 2bb4a38ee7df3e7f9751c94ec81a9d943d3db011..ec292d24d4e96dbaaec8d111cbef69da50067634 100644 (file)
--- a/include/lttng/ust-tracepoint-event.h
+++ b/include/lttng/ust-tracepoint-event.h
@@ -865,9 +865,7 @@ LTTNG_TP_EXTERN_C const int *_loglevel___##__provider##___##__name     \
 
 #include TRACEPOINT_INCLUDE
 
-#ifdef __cplusplus
 #undef LTTNG_TP_EXTERN_C
-#endif
 
 /*
  * Stage 6.1 of tracepoint event generation.
@@ -893,13 +891,11 @@ LTTNG_TP_EXTERN_C const int *_loglevel___##__provider##___##__name           \
 #undef TRACEPOINT_MODEL_EMF_URI
 #define TRACEPOINT_MODEL_EMF_URI(__provider, __name, __uri)               \
 LTTNG_TP_EXTERN_C const char *_model_emf_uri___##__provider##___##__name   \
-               __attribute__((visibility("hidden"))) = __uri              \
+               __attribute__((visibility("hidden"))) = __uri;             \
 
 #include TRACEPOINT_INCLUDE
 
-#ifdef __cplusplus
 #undef LTTNG_TP_EXTERN_C
-#endif
 
 /*
  * Stage 7.1 of tracepoint event generation.
@@ -1011,7 +1007,7 @@ _TP_COMBINE_TOKENS(__lttng_events_init__, TRACEPOINT_PROVIDER)(void)
        _TP_COMBINE_TOKENS(__tracepoint_provider_check_, TRACEPOINT_PROVIDER)();
        ret = lttng_probe_register(&_TP_COMBINE_TOKENS(__probe_desc___, TRACEPOINT_PROVIDER));
        if (ret) {
-               fprintf(stderr, "LTTng-UST: Error (%d) while registering tracepoint probe. Duplicate registration of tracepoint probes having the same name is not allowed.\n", ret);
+               fprintf(stderr, "LTTng-UST: Error (%d) while registering tracepoint probe.\n", ret);
                abort();
        }
 }