Avoid reserved keyword and include next warnings

Author: lucic71

cpp2rust/compat/arpa/inet.h

@@ -8,12 +8,12 @@
 #undef htonl
 #undef htons
 
-uint32_t __cpp2rust_ntohl(uint32_t x);
-uint16_t __cpp2rust_ntohs(uint16_t x);
-uint32_t __cpp2rust_htonl(uint32_t x);
-uint16_t __cpp2rust_htons(uint16_t x);
+uint32_t cpp2rust_ntohl(uint32_t x);
+uint16_t cpp2rust_ntohs(uint16_t x);
+uint32_t cpp2rust_htonl(uint32_t x);
+uint16_t cpp2rust_htons(uint16_t x);
 
-#define ntohl(x) __cpp2rust_ntohl(x)
-#define ntohs(x) __cpp2rust_ntohs(x)
-#define htonl(x) __cpp2rust_htonl(x)
-#define htons(x) __cpp2rust_htons(x)
+#define ntohl(x) cpp2rust_ntohl(x)
+#define ntohs(x) cpp2rust_ntohs(x)
+#define htonl(x) cpp2rust_htonl(x)
+#define htons(x) cpp2rust_htons(x)

cpp2rust/compat/assert.h

@@ -9,6 +9,6 @@
 #include <stdbool.h>
 #endif
 
-void __cpp2rust_assert_fail(bool condition) __attribute__((noreturn));
+void cpp2rust_assert_fail(bool condition) __attribute__((noreturn));
 
-#define assert(expr) __cpp2rust_assert_fail(expr)
+#define assert(expr) cpp2rust_assert_fail(expr)

cpp2rust/compat/platform_flags.h

@@ -11,6 +11,7 @@ static inline std::vector<std::string> getPlatformClangFlags() {
       "-resource-dir=" CLANG_RESOURCE_DIR,
       "-I" COMPAT_INCLUDE_DIR,
       "-D_FORTIFY_SOURCE=0",
+      "-Wno-gnu-include-next",
   };
 #ifdef MACOS_SDK_PATH
   flags.push_back("-isysroot" MACOS_SDK_PATH);

rules/assert/src.cpp

@@ -4,5 +4,5 @@
 #include <assert.h>
 
 void f1(bool condition) {
-  return __cpp2rust_assert_fail(condition);
+  return cpp2rust_assert_fail(condition);
 }