summaryrefslogtreecommitdiff
path: root/navit/intl_cmake
diff options
context:
space:
mode:
authormartin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220>2011-02-15 09:06:10 +0000
committermartin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220>2011-02-15 09:06:10 +0000
commit645b269e21a305bbd9f63d727910d18233f37bbb (patch)
tree7ef6b340db04e213417bec097f40f27a33306f32 /navit/intl_cmake
parentf2bff450d047ea312d3a48a05e82220f922a1263 (diff)
downloadnavit-svn-645b269e21a305bbd9f63d727910d18233f37bbb.tar.gz
Fix:libintl:Don't use inline since not supported on all compilers
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@4166 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit/intl_cmake')
-rw-r--r--navit/intl_cmake/gettextP.h2
-rw-r--r--navit/intl_cmake/hash-string.h2
-rw-r--r--navit/intl_cmake/l10nflist.c2
-rw-r--r--navit/intl_cmake/plural.c6
-rw-r--r--navit/intl_cmake/xsize.h8
5 files changed, 10 insertions, 10 deletions
diff --git a/navit/intl_cmake/gettextP.h b/navit/intl_cmake/gettextP.h
index 4d66c3de..ab9cc8c6 100644
--- a/navit/intl_cmake/gettextP.h
+++ b/navit/intl_cmake/gettextP.h
@@ -59,7 +59,7 @@
# include <byteswap.h>
# define SWAP(i) bswap_32 (i)
#else
-static inline nls_uint32
+static nls_uint32
SWAP (i)
nls_uint32 i;
{
diff --git a/navit/intl_cmake/hash-string.h b/navit/intl_cmake/hash-string.h
index 093e3b1c..eb3a6ae7 100644
--- a/navit/intl_cmake/hash-string.h
+++ b/navit/intl_cmake/hash-string.h
@@ -25,7 +25,7 @@
/* Defines the so called `hashpjw' function by P.J. Weinberger
[see Aho/Sethi/Ullman, COMPILERS: Principles, Techniques and Tools,
1986, 1987 Bell Telephone Laboratories, Inc.] */
-static inline unsigned long int
+static unsigned long int
hash_string (const char *str_param)
{
unsigned long int hval, g;
diff --git a/navit/intl_cmake/l10nflist.c b/navit/intl_cmake/l10nflist.c
index eb995aaf..7d4182ad 100644
--- a/navit/intl_cmake/l10nflist.c
+++ b/navit/intl_cmake/l10nflist.c
@@ -152,7 +152,7 @@ argz_next__ (char *argz, size_t argz_len, const char *entry)
/* Return number of bits set in X. */
-static inline int
+static int
pop (int x)
{
/* We assume that no more than 16 bits are used. */
diff --git a/navit/intl_cmake/plural.c b/navit/intl_cmake/plural.c
index 72494f9e..89f4b45e 100644
--- a/navit/intl_cmake/plural.c
+++ b/navit/intl_cmake/plural.c
@@ -109,13 +109,13 @@ new_exp (int nargs, enum operator op, struct expression * const *args)
return NULL;
}
-static inline struct expression *
+static struct expression *
new_exp_0 (enum operator op)
{
return new_exp (0, op, NULL);
}
-static inline struct expression *
+static struct expression *
new_exp_1 (enum operator op, struct expression *right)
{
struct expression *args[1];
@@ -134,7 +134,7 @@ new_exp_2 (enum operator op, struct expression *left, struct expression *right)
return new_exp (2, op, args);
}
-static inline struct expression *
+static struct expression *
new_exp_3 (enum operator op, struct expression *bexp,
struct expression *tbranch, struct expression *fbranch)
{
diff --git a/navit/intl_cmake/xsize.h b/navit/intl_cmake/xsize.h
index 362e24b7..f0bf7139 100644
--- a/navit/intl_cmake/xsize.h
+++ b/navit/intl_cmake/xsize.h
@@ -50,7 +50,7 @@
((N) <= SIZE_MAX ? (size_t) (N) : SIZE_MAX)
/* Sum of two sizes, with overflow check. */
-static inline size_t
+static size_t
#if __GNUC__ >= 3
__attribute__ ((__pure__))
#endif
@@ -61,7 +61,7 @@ xsum (size_t size1, size_t size2)
}
/* Sum of three sizes, with overflow check. */
-static inline size_t
+static size_t
#if __GNUC__ >= 3
__attribute__ ((__pure__))
#endif
@@ -71,7 +71,7 @@ xsum3 (size_t size1, size_t size2, size_t size3)
}
/* Sum of four sizes, with overflow check. */
-static inline size_t
+static size_t
#if __GNUC__ >= 3
__attribute__ ((__pure__))
#endif
@@ -81,7 +81,7 @@ xsum4 (size_t size1, size_t size2, size_t size3, size_t size4)
}
/* Maximum of two sizes, with overflow check. */
-static inline size_t
+static size_t
#if __GNUC__ >= 3
__attribute__ ((__pure__))
#endif