Mercurial > pidgin3 / changeset

--- a/ChangeLog	Fri Sep 12 11:09:41 2014 -0700
+++ b/ChangeLog	Sat Sep 27 21:31:32 2014 -0400
@@ -11,7 +11,7 @@
 
 	Windows-Specific Changes:
 	* Updates to dependencies:
-		* NSS 3.16 and NSPR 4.10.4
+		* NSS 3.17.1 and NSPR 4.10.7
 
 	Finch:
 	* Fix build against Python 3. (Ed Catmur) (#15969)

--- a/libpurple/plugins/ssl/ssl-nss.c	Fri Sep 12 11:09:41 2014 -0700
+++ b/libpurple/plugins/ssl/ssl-nss.c	Sat Sep 27 21:31:32 2014 -0400
@@ -32,6 +32,9 @@
 #ifdef _WIN32
 # ifndef HAVE_LONG_LONG
 #define HAVE_LONG_LONG
+/* WINDDK_BUILD is defined because the checks around usage of
+ * intrisic functions are wrong in nspr */
+#define WINDDK_BUILD
 # endif
 #else
 /* TODO: Why is this done?

--- a/libpurple/win32/global.mak	Fri Sep 12 11:09:41 2014 -0700
+++ b/libpurple/win32/global.mak	Sat Sep 27 21:31:32 2014 -0400
@@ -17,7 +17,7 @@
 BONJOUR_TOP ?= $(WIN32_DEV_TOP)/Bonjour_SDK
 LIBXML2_TOP ?= $(WIN32_DEV_TOP)/libxml2-2.9.0
 MEANWHILE_TOP ?= $(WIN32_DEV_TOP)/meanwhile-1.0.2_daa3
-NSS_TOP ?= $(WIN32_DEV_TOP)/nss-3.16-nspr-4.10.4
+NSS_TOP ?= $(WIN32_DEV_TOP)/nss-3.17.1-nspr-4.10.7
 PERL_LIB_TOP ?= $(WIN32_DEV_TOP)/perl-5.10.0
 SILC_TOOLKIT ?= $(WIN32_DEV_TOP)/silc-toolkit-1.1.10
 TCL_LIB_TOP ?= $(WIN32_DEV_TOP)/tcl-8.4.5