From 460ff1a37bf40b8f7a41d09b1c28d98959d3e694 Mon Sep 17 00:00:00 2001 From: fef Date: Thu, 15 Jul 2021 23:54:39 +0200 Subject: [PATCH] remove extern "C" wrappers in internal headers Internal headers, i.e. those prefixed with an underscore, aren't supposed to be included in external projects anyways and libneo itself is obviously C only. --- include/neo/_error.h | 8 -------- include/neo/_nalloc.h | 8 -------- include/neo/_nref.h | 8 -------- include/neo/_stddef.h | 8 -------- include/neo/_string.h | 8 -------- include/neo/_types.h | 8 -------- 6 files changed, 48 deletions(-) diff --git a/include/neo/_error.h b/include/neo/_error.h index 8662446..5ebdb01 100644 --- a/include/neo/_error.h +++ b/include/neo/_error.h @@ -2,10 +2,6 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - #include "neo/_toolchain.h" #include "neo/_types.h" @@ -68,10 +64,6 @@ void errput(error *err); */ #define errmsg(err) ((err) == nil ? (string *)nil : (err)->_message) -#ifdef __cplusplus -}; /* extern "C" */ -#endif - /* * This file is part of libneo. * Copyright (c) 2021 Fefie . diff --git a/include/neo/_nalloc.h b/include/neo/_nalloc.h index 3625611..29c9fa1 100644 --- a/include/neo/_nalloc.h +++ b/include/neo/_nalloc.h @@ -2,10 +2,6 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - #include "neo/_toolchain.h" #include "neo/_types.h" @@ -50,10 +46,6 @@ void *nzalloc(usize size, error *err); __neo_malloc(nfree, 1) void *nrealloc(void *ptr, usize newsize, error *err); -#ifdef __cplusplus -}; /* extern "C" */ -#endif - /* * This file is part of libneo. * Copyright (c) 2021 Fefie . diff --git a/include/neo/_nref.h b/include/neo/_nref.h index 31e787f..509c43e 100644 --- a/include/neo/_nref.h +++ b/include/neo/_nref.h @@ -2,10 +2,6 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - #include "neo/_types.h" /** @@ -51,10 +47,6 @@ int _neo_nput(struct _neo_nref *ref); */ #define nput(ptr) (_neo_nput( &(ptr)->__neo_nref )) -#ifdef __cplusplus -}; /* extern "C" */ -#endif - /* * This file is part of libneo. * Copyright (c) 2021 Fefie . diff --git a/include/neo/_stddef.h b/include/neo/_stddef.h index e63d78e..7e4c967 100644 --- a/include/neo/_stddef.h +++ b/include/neo/_stddef.h @@ -2,10 +2,6 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - #include "neo/_types.h" #ifdef __cplusplus @@ -54,10 +50,6 @@ extern "C" { */ #define nlen(thing) ((thing)->__neo_nlen) -#ifdef __cplusplus -}; /* extern "C" */ -#endif - /* * This file is part of libneo. * Copyright (c) 2021 Fefie . diff --git a/include/neo/_string.h b/include/neo/_string.h index 4fe19c4..1d3f3d6 100644 --- a/include/neo/_string.h +++ b/include/neo/_string.h @@ -2,10 +2,6 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - #include "neo/_types.h" #include "neo/_toolchain.h" @@ -178,10 +174,6 @@ string *leftpad(const string *s, usize length, nchar fill, error *err); (err)->_number + 1 < 2; \ __pos += utf8_to_nchr(nchr, __pos, err)) -#ifdef __cplusplus -}; /* extern "C" */ -#endif - /* * This file is part of libneo. * Copyright (c) 2021 Fefie . diff --git a/include/neo/_types.h b/include/neo/_types.h index 6ede0d5..62c6431 100644 --- a/include/neo/_types.h +++ b/include/neo/_types.h @@ -2,10 +2,6 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - #include "neo/_stddef.h" typedef __INT8_TYPE__ i8; @@ -72,10 +68,6 @@ struct _neo_error { }; typedef struct _neo_error error; -#ifdef __cplusplus -}; /* extern "C" */ -#endif - /* * This file is part of libneo. * Copyright (c) 2021 Fefie .