X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fgl_xsublist.h;h=ef892fa43c68def741b009dcb573007489af804d;hb=1276a2c5f24c0c932426aca9c899fa524d2443f2;hp=5db5102737ddb5cd279c336e02655ab8b8a3ed4e;hpb=1602f0afed21be664fcf5c42d59db07cc22c56d6;p=gnulib.git diff --git a/lib/gl_xsublist.h b/lib/gl_xsublist.h index 5db510273..ef892fa43 100644 --- a/lib/gl_xsublist.h +++ b/lib/gl_xsublist.h @@ -1,6 +1,6 @@ /* Sequential list data type backed by another list, with out-of-memory checking. - Copyright (C) 2009-2012 Free Software Foundation, Inc. + Copyright (C) 2009-2014 Free Software Foundation, Inc. Written by Bruno Haible , 2009. This program is free software: you can redistribute it and/or modify @@ -22,6 +22,14 @@ #include "gl_sublist.h" #include "xalloc.h" +#ifndef _GL_INLINE_HEADER_BEGIN + #error "Please include config.h first." +#endif +_GL_INLINE_HEADER_BEGIN +#ifndef GL_XSUBLIST_INLINE +# define GL_XSUBLIST_INLINE _GL_INLINE +#endif + #ifdef __cplusplus extern "C" { #endif @@ -29,13 +37,7 @@ extern "C" { /* These functions are thin wrappers around the corresponding functions with _nx_ infix from gl_sublist.h. Upon out-of-memory, they invoke xalloc_die (), instead of returning an error indicator. */ -extern gl_list_t gl_sublist_create (gl_list_t whole_list, - size_t start_index, size_t end_index); - -#if HAVE_INLINE - -# define gl_sublist_create gl_sublist_create_inline -static inline gl_list_t +GL_XSUBLIST_INLINE gl_list_t gl_sublist_create (gl_list_t whole_list, size_t start_index, size_t end_index) { gl_list_t result = gl_sublist_nx_create (whole_list, start_index, end_index); @@ -44,10 +46,10 @@ gl_sublist_create (gl_list_t whole_list, size_t start_index, size_t end_index) return result; } -#endif - #ifdef __cplusplus } #endif +_GL_INLINE_HEADER_END + #endif /* _GL_XSUBLIST_H */