Skip to content

Commit

Permalink
Consolidate macro duplication (#653)
Browse files Browse the repository at this point in the history
* Consolidate macro duplication

Signed-off-by: Dan Rose <dan@digilabs.io>

* readd extern C

Signed-off-by: Dirk Thomas <dirk-thomas@users.noreply.github.com>

Co-authored-by: Dirk Thomas <dirk-thomas@users.noreply.github.com>
  • Loading branch information
rotu and dirk-thomas authored Jul 23, 2020
1 parent 70d1325 commit 2a4d2f4
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion rcl/include/rcl/macros.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
#ifndef RCL__MACROS_H_
#define RCL__MACROS_H_

#include "rcutils/macros.h"

#ifdef __cplusplus
extern "C"
{
Expand All @@ -23,7 +25,7 @@ extern "C"
/// Ignored return values of functions with this macro will emit a warning.
#define RCL_WARN_UNUSED RCUTILS_WARN_UNUSED

#define RCL_UNUSED(x) (void)(x)
#define RCL_UNUSED(x) RCUTILS_UNUSED(x)

#ifdef __cplusplus
}
Expand Down

0 comments on commit 2a4d2f4

Please sign in to comment.