libsoup r1121 - in trunk: . libsoup

[danw svn gnome org]

Author: danw
Date: Sat Apr  5 14:26:05 2008
New Revision: 1121
URL: http://svn.gnome.org/viewvc/libsoup?rev=1121&view=rev

Log:
	* libsoup/soup-method.c: Explicitly assign each of the variables
	to NULL, because that apparently causes the OS X linker to treat
	them differently than if they are left implicitly NULL. #522957.


Modified:
   trunk/ChangeLog
   trunk/libsoup/soup-method.c

Modified: trunk/libsoup/soup-method.c
==============================================================================
--- trunk/libsoup/soup-method.c	(original)
+++ trunk/libsoup/soup-method.c	Sat Apr  5 14:26:05 2008
@@ -9,19 +9,23 @@
 #include <config.h>
 #endif
 
-const char *_SOUP_METHOD_CONNECT;
-const char *_SOUP_METHOD_COPY;
-const char *_SOUP_METHOD_DELETE;
-const char *_SOUP_METHOD_GET;
-const char *_SOUP_METHOD_HEAD;
-const char *_SOUP_METHOD_LOCK;
-const char *_SOUP_METHOD_MKCOL;
-const char *_SOUP_METHOD_MOVE;
-const char *_SOUP_METHOD_OPTIONS;
-const char *_SOUP_METHOD_PATCH;
-const char *_SOUP_METHOD_POST;
-const char *_SOUP_METHOD_PROPFIND;
-const char *_SOUP_METHOD_PROPPATCH;
-const char *_SOUP_METHOD_PUT;
-const char *_SOUP_METHOD_TRACE;
-const char *_SOUP_METHOD_UNLOCK;
+#include "soup-method.h"
+
+/* Explicit assignment to NULL is to help the OS X linker not be
+ * stupid. #522957
+ */
+const char *_SOUP_METHOD_CONNECT = NULL;
+const char *_SOUP_METHOD_COPY = NULL;
+const char *_SOUP_METHOD_DELETE = NULL;
+const char *_SOUP_METHOD_GET = NULL;
+const char *_SOUP_METHOD_HEAD = NULL;
+const char *_SOUP_METHOD_LOCK = NULL;
+const char *_SOUP_METHOD_MKCOL = NULL;
+const char *_SOUP_METHOD_MOVE = NULL;
+const char *_SOUP_METHOD_OPTIONS = NULL;
+const char *_SOUP_METHOD_POST = NULL;
+const char *_SOUP_METHOD_PROPFIND = NULL;
+const char *_SOUP_METHOD_PROPPATCH = NULL;
+const char *_SOUP_METHOD_PUT = NULL;
+const char *_SOUP_METHOD_TRACE = NULL;
+const char *_SOUP_METHOD_UNLOCK = NULL;