Use __c99inline from sys/cdefs.h

2 files changed, 1 insertions, 42 deletions

diff --git a/sail/array.h b/sail/array.h
index efbaf99a..d6545df0 100644
--- a/sail/array.h
+++ b/sail/array.h
@@ -30,8 +30,6 @@
 #ifndef ARRAY_H
 #define ARRAY_H
 
-#include "inlinedefs.h"
-
 #define ARRAYS_CHECKED
 
 #ifdef ARRAYS_CHECKED
@@ -65,7 +63,7 @@ void array_remove(struct array *a, unsigned index_);
 // inlining for base operations
 
 #ifndef ARRAYINLINE
-#define ARRAYINLINE INLINE
+#define ARRAYINLINE __c99inline
 #endif
 
 ARRAYINLINE unsigned
diff --git a/sail/inlinedefs.h b/sail/inlinedefs.h
deleted file mode 100644
index e7f02396..00000000
--- a/sail/inlinedefs.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*-
- * Copyright (c) 2009 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by David A. Holland.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#if defined(__GNUC__) && !defined(__GNUC_STDC_INLINE__)
-/* gcc's non-C99 inline semantics */
-#define INLINE extern inline
-#elif defined(__STDC__) && __STDC_VERSION__ >= 199901L
-/* C99 */
-#define INLINE inline
-#else
-/* something else; static inline is safest */
-#define INLINE static inline
-#endif