Kaleb KEITHLEY has uploaded this change for review.

View Change

monitoring: C++ cleanup to build with userspace-rcu-14.0.0

New version of userspace-rcu has now has broad c++ support and the
original monitoring implementation fails to build as a result of the
use nested 'extern "C" { ... }'. Note that nested 'extern "C"' is
tricky at best to use.

This patch adds safe, non-nested extern "C" protection to the minimal
set of ganesha internal headers necessary to build monitoring. The one
hack here is the wrapping of the
  #include <rpc/xdr_inline.h>
in include/gsh_rpc.h. gsh_rpc is one of just a couple of ntirpc headers
that does not have its own
  '#ifdef __cplusplus extern "C" { ... } #endif'
wrapper.

Change-Id: I680ad2c79648ef44c54ad43e653db113722b66a9
ChangeId: I5834b8061f01569d1d51f5882739c23d7072cf1a
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
---
M src/include/config_parsing.h
M src/include/display.h
M src/include/gsh_list.h
M src/include/gsh_refstr.h
M src/include/gsh_rpc.h
M src/include/gsh_types.h
M src/include/log.h
M src/include/monitoring.h
M src/include/mount.h
M src/include/nfs23.h
M src/include/nfs_convert.h
M src/monitoring/monitoring.cc
12 files changed, 122 insertions(+), 2 deletions(-)

git pull ssh://review.gerrithub.io:29418/ffilz/nfs-ganesha refs/changes/07/553407/1

To view, visit change 553407. To unsubscribe, or for help writing mail filters, visit settings.