diff options
| author | Dan Winship <danw@gnome.org> | 2009-07-02 21:28:53 -0400 |
|---|---|---|
| committer | Dan Winship <danw@gnome.org> | 2009-07-02 21:28:53 -0400 |
| commit | aad40ac467d12a188aed01e543aef5016aa4d3cb (patch) | |
| tree | 125c8fd41e7e9db703bf6f1ad062236a915a8411 /libsoup/soup-uri.h | |
| parent | 3c9f3cdffc32126700f25d8a0c55f68b6f587bde (diff) | |
| download | libsoup-aad40ac467d12a188aed01e543aef5016aa4d3cb.tar.gz | |
Fix the SOUP_METHOD_* and SOUP_URI_SCHEME_* defines to be threadsafe
Also fix/optimize a few other things in URI scheme canonicalization
Diffstat (limited to 'libsoup/soup-uri.h')
| -rw-r--r-- | libsoup/soup-uri.h | 5 |
1 files changed, 3 insertions, 2 deletions
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 <libsoup/soup-types.h> +#include <libsoup/soup-misc.h> 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, |