From aad40ac467d12a188aed01e543aef5016aa4d3cb Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Thu, 2 Jul 2009 21:28:53 -0400 Subject: Fix the SOUP_METHOD_* and SOUP_URI_SCHEME_* defines to be threadsafe Also fix/optimize a few other things in URI scheme canonicalization --- libsoup/soup-uri.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'libsoup/soup-uri.h') diff --git a/libsoup/soup-uri.h b/libsoup/soup-uri.h index 32de7a3b..c05f3f23 100644 --- a/libsoup/soup-uri.h +++ b/libsoup/soup-uri.h @@ -9,6 +9,7 @@ #define SOUP_URI_H 1 #include +#include G_BEGIN_DECLS @@ -30,8 +31,8 @@ struct _SoupURI { GType soup_uri_get_type (void); #define SOUP_TYPE_URI (soup_uri_get_type ()) -#define SOUP_URI_SCHEME_HTTP (_SOUP_URI_SCHEME_HTTP ? _SOUP_URI_SCHEME_HTTP : (_SOUP_URI_SCHEME_HTTP = g_intern_static_string ("http"))) -#define SOUP_URI_SCHEME_HTTPS (_SOUP_URI_SCHEME_HTTPS ? _SOUP_URI_SCHEME_HTTPS : (_SOUP_URI_SCHEME_HTTPS = g_intern_static_string ("https"))) +#define SOUP_URI_SCHEME_HTTP _SOUP_ATOMIC_INTERN_STRING (_SOUP_URI_SCHEME_HTTP, "http") +#define SOUP_URI_SCHEME_HTTPS _SOUP_ATOMIC_INTERN_STRING (_SOUP_URI_SCHEME_HTTPS, "https") extern const char *_SOUP_URI_SCHEME_HTTP, *_SOUP_URI_SCHEME_HTTPS; SoupURI *soup_uri_new_with_base (SoupURI *base, -- cgit v1.2.1