aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@ximian.com>2003-03-06 23:22:56 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2003-03-06 23:22:56 +0800
commitf1e001698a5db0b0ea3136c973769e0f6019d9ea (patch)
tree11ba661d22bb7599846da2ff4fcfdda7464cb13f
parentb268196c1cc77b65645661b1cab47a8211d69ec9 (diff)
downloadgsoc2013-evolution-f1e001698a5db0b0ea3136c973769e0f6019d9ea.tar.gz
gsoc2013-evolution-f1e001698a5db0b0ea3136c973769e0f6019d9ea.tar.zst
gsoc2013-evolution-f1e001698a5db0b0ea3136c973769e0f6019d9ea.zip
Same as below.
2003-03-06 Jeffrey Stedfast <fejj@ximian.com> * camel-text-index.c (camel_utf8_next): Same as below. * camel-search-private.c (camel_utf8_getc): Updated since not all platforms/compiles support __inline__. svn path=/trunk/; revision=20192
-rw-r--r--camel/ChangeLog7
-rw-r--r--camel/camel-search-private.c2
-rw-r--r--camel/camel-text-index.c2
3 files changed, 9 insertions, 2 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index 9c3ceb09a0..ac301dfa6f 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,5 +1,12 @@
2003-03-06 Jeffrey Stedfast <fejj@ximian.com>
+ * camel-text-index.c (camel_utf8_next): Same as below.
+
+ * camel-search-private.c (camel_utf8_getc): Updated since not all
+ platforms/compiles support __inline__.
+
+2003-03-06 Jeffrey Stedfast <fejj@ximian.com>
+
* camel-mime-part.c (camel_mime_part_get_encoding): Get rid of the
const return - it mismatches the prototype and we don't need it
anyway. Fixes bug #39173.
diff --git a/camel/camel-search-private.c b/camel/camel-search-private.c
index 8b0879f7ed..7cadbd525a 100644
--- a/camel/camel-search-private.c
+++ b/camel/camel-search-private.c
@@ -495,7 +495,7 @@ camel_search_message_body_contains (CamelDataWrapper *object, regex_t *pattern)
return truth;
}
-static __inline__ guint32
+static inline guint32
camel_utf8_getc(const unsigned char **ptr)
{
register unsigned char *p = (unsigned char *)*ptr;
diff --git a/camel/camel-text-index.c b/camel/camel-text-index.c
index 60dc5b7402..710723168b 100644
--- a/camel/camel-text-index.c
+++ b/camel/camel-text-index.c
@@ -1384,7 +1384,7 @@ text_index_name_add_word(CamelIndexName *idn, const char *word)
Because it doesn't hang/loop forever on bad data
Used to clean up utf8 before it gets further */
-static __inline__ guint32
+static inline guint32
camel_utf8_next(const unsigned char **ptr, const unsigned char *ptrend)
{
register unsigned char *p = (unsigned char *)*ptr;