Attachment #157655 for bug #228375

Lines 51-57 Link Here

(-)jabberd14-1.6.1.1-orig/jabberd/jabberd.cc (-1 lines)
51		51
52	#include <popt.h>	52	#include <popt.h>
53		53
54	xht debug__zones = NULL; /*< the debugging zones, that are enabled (key = zone string, value = zone string) /
55	extern int deliver__flag;	54	extern int deliver__flag;
56	extern xmlnode greymatter__;	55	extern xmlnode greymatter__;
57		56

Lines 109-114 Link Here

(-)jabberd14-1.6.1.1-orig/jabberd/jabberd.h (+2 lines)
109	# include <gnutls/openpgp.h>	109	# include <gnutls/openpgp.h>
110	#endif	110	#endif
111		111
		112	static xht debug__zones = NULL; /*< the debugging zones, that are enabled (key = zone string, value = zone string) /
		113
112	/** Packet types */	114	/** Packet types */
113	typedef enum { p_NONE, p_NORM, p_XDB, p_LOG, p_ROUTE } ptype;	115	typedef enum { p_NONE, p_NORM, p_XDB, p_LOG, p_ROUTE } ptype;

Lines 37-43 Link Here

(-)jabberd14-1.6.1.1-orig/xdb_file/xdbfiletool.cc (-1 / +1 lines)
37	* we have to remove these globals (or at least move them	37	* we have to remove these globals (or at least move them
38	* inside the library	38	* inside the library
39	*/	39	*/
40	xht debug__zones;	40	extern xht debug__zones;
41		41
42	/* end of hack */	42	/* end of hack */
43		43

Return to bug 228375