Merge pull request #12798 from donaldsharp/rib_match_multicast

[mirror_frr.git] / lib / defaults.h

diff --git a/lib/defaults.h b/lib/defaults.h
index 7cdd18120e73ccfa456ee6c917f3a4e2567f9f4d..afb3223db3544759760d1366dc40eb27bb186eec 100644 (file)
--- a/lib/defaults.h
+++ b/lib/defaults.h
@@ -1,18 +1,7 @@
+// SPDX-License-Identifier: ISC
 /*
  * FRR switchable defaults.
  * Copyright (C) 2017-2019  David Lamparter for NetDEF, Inc.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
 #ifndef _FRR_DEFAULTS_H
@@ -22,6 +11,10 @@
 
 #include "compiler.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* frr_default wraps information about a default that has different
  * values depending on FRR version or default-set
  *
@@ -94,7 +87,8 @@ struct frr_default {
        static void _dfltinit_##varname(void)                                  \
        {                                                                      \
                frr_default_add(&_dflt_##varname);                             \
-       }
+       }                                                                      \
+       MACRO_REQUIRE_SEMICOLON() /* end */
 
 /* use:
  *   FRR_CFG_DEFAULT_LONG(SHARP_BLUNTNESS,
@@ -135,4 +129,8 @@ extern bool frr_defaults_profile_valid(const char *profile);
 /* like strcmp(), but with version ordering */
 extern int frr_version_cmp(const char *aa, const char *bb);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _FRR_DEFAULTS_H */