Replace HAVE_INLINE in installed include files.

3 files changed, 97 insertions, 2 deletions

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 36c19ca..6292364 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -38,9 +38,13 @@ include_HEADERS = \
   uniwbrk.h \
   unilbrk.h \
   uninorm.h \
-  unicase.h
+  unicase.h \
+  unistring-inline.h
 
-#AM_CPPFLAGS =
+noinst_HEADERS = \
+  unistring-notinline.h
+
+AM_CPPFLAGS = -DIN_LIBUNISTRING
 
 # Rules generated and collected by gnulib-tool.
 include Makefile.gnulib
diff --git a/lib/unistring-inline.h b/lib/unistring-inline.h
new file mode 100644
index 0000000..bdb0b22
--- /dev/null
+++ b/lib/unistring-inline.h
@@ -0,0 +1,68 @@
+/* Decision whether to use 'inline' or not.
+   Copyright (C) 2006, 2009 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify it
+   under the terms of the GNU Lesser General Public License as published
+   by the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* Written by Bruno Haible <bruno@clisp.org>, 2009.  */
+
+#ifndef _UNISTRING_INLINE_H
+#define _UNISTRING_INLINE_H
+
+/* This is like the gl_INLINE macro in gnulib/m4/inline.m4, but makes its
+   decision based on defined preprocessor symbols rather than through
+   autoconf tests.
+   See <http://lists.gnu.org/archive/html/bug-gnulib/2006-11/msg00055.html>  */
+
+/* Test for the 'inline' keyword or equivalent.  ISO C 99 semantics is not
+   required, only that 'static inline' works.
+   Define 'inline' to a supported equivalent, or to nothing if not supported,
+   like AC_C_INLINE does.  Also, define UNISTRING_HAVE_INLINE if 'inline' or an
+   equivalent is effectively supported, i.e. if the compiler is likely to
+   drop unused 'static inline' functions.  */
+
+#if defined __GNUC__
+/* GNU C or GNU C++.  */
+# if defined __NO_INLINE__
+/* GCC defines __NO_INLINE__ if not optimizing or if -fno-inline is
+   specified.  */
+#  define UNISTRING_HAVE_INLINE 0
+# else
+/* Whether 'inline' has the old GCC semantics or the ISO C 99 semantics,
+   does not matter.  */
+#  define UNISTRING_HAVE_INLINE 1
+#  ifndef inline
+#   define inline __inline__
+#  endif
+# endif
+#elif defined __cplusplus
+/* Any other C++ compiler.  */
+# define UNISTRING_HAVE_INLINE 1
+#else
+/* Any other C compiler.  */
+# if defined __osf__
+/* OSF/1 cc has inline.  */
+#  define UNISTRING_HAVE_INLINE 1
+# elif defined _AIX || defined __sgi
+/* AIX 4 xlc, IRIX 6.5 cc have __inline.  */
+#  define UNISTRING_HAVE_INLINE 1
+#  ifndef inline
+#   define inline __inline
+#  endif
+# else
+/* Some older C compiler.  */
+#  define UNISTRING_HAVE_INLINE 0
+# endif
+#endif
+
+#endif /* _UNISTRING_INLINE_H */
diff --git a/lib/unistring-notinline.h b/lib/unistring-notinline.h
new file mode 100644
index 0000000..8ef35ec
--- /dev/null
+++ b/lib/unistring-notinline.h
@@ -0,0 +1,23 @@
+/* Override decision whether to use 'inline' or not.
+   Copyright (C) 2009 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify it
+   under the terms of the GNU Lesser General Public License as published
+   by the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* Written by Bruno Haible <bruno@clisp.org>, 2009.  */
+
+#include "unistring-inline.h"
+#undef UNISTRING_HAVE_INLINE
+#define UNISTRING_HAVE_INLINE 0
+#undef HAVE_INLINE
+#define HAVE_INLINE 0