summary refs log tree commit diff stats
path: root/plugins/wmpa/wmpnetwork.cpp
diff options
context:
space:
mode:
authorTingPing <tngpng@gmail.com>2013-03-24 18:49:45 -0300
committerTingPing <tngpng@gmail.com>2013-03-24 18:49:45 -0300
commit2bd12b2e255715df766737541a01b8f25fe764aa (patch)
treee6b502daf63b0166aa07a339a7625241a276edfc /plugins/wmpa/wmpnetwork.cpp
parent39cfcc74686e4971333a45929aa155cb0865bb2b (diff)
Typo
Diffstat (limited to 'plugins/wmpa/wmpnetwork.cpp')
0 files changed, 0 insertions, 0 deletions
 

generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-10-25 06:32:30 +0000


 


'n98' href='#n98'>98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257


diff -ruN --strip-trailing-cr nss-3.13.6.orig/mozilla/dbm/include/mcom_db.h nss-3.13.6/mozilla/dbm/include/mcom_db.h
--- nss-3.13.6.orig/mozilla/dbm/include/mcom_db.h	2009-06-05 01:18:50 +0200
+++ nss-3.13.6/mozilla/dbm/include/mcom_db.h	2012-10-06 00:54:22 +0200
@@ -40,6 +40,15 @@
 #define off_t long
 #endif
 
+#ifdef WINDDK_BUILD
+#ifndef stat
+#define stat _stat
+#endif
+#ifndef getpid
+#define getpid GetCurrentProcessId
+#endif
+#endif
+
 #ifndef macintosh
 #include <sys/types.h>
 #endif
diff -ruN --strip-trailing-cr nss-3.13.6.orig/mozilla/dbm/src/mktemp.c nss-3.13.6/mozilla/dbm/src/mktemp.c
--- nss-3.13.6.orig/mozilla/dbm/src/mktemp.c	2009-06-05 01:19:31 +0200
+++ nss-3.13.6/mozilla/dbm/src/mktemp.c	2012-10-06 00:54:22 +0200
@@ -45,13 +45,13 @@
 #include <ctype.h>
 #include "mcom_db.h"
 
-#ifndef _WINDOWS
-#include <unistd.h>
-#endif
-
 #ifdef _WINDOWS
+#ifndef WINDDK_BUILD
 #include <process.h>
+#endif
 #include "winfile.h"
+#else
+#include <unistd.h>
 #endif
 
 static int _gettemp(char *path, register int *doopen, int extraFlags);
diff -ruN --strip-trailing-cr nss-3.13.6.orig/mozilla/nsprpub/config/config.mk nss-3.13.6/mozilla/nsprpub/config/config.mk
--- nss-3.13.6.orig/mozilla/nsprpub/config/config.mk	2012-03-06 14:13:38 +0100
+++ nss-3.13.6/mozilla/nsprpub/config/config.mk	2012-10-06 00:54:22 +0200
@@ -132,6 +132,15 @@
 DEFINES += -DMOZ_UNICODE
 endif
 
+ifdef WINDDK_BUILD
+OS_CFLAGS += -DWINDDK_BUILD
+ifdef USE_64
+OS_LIBS += msvcrt_win2003.obj
+else
+OS_LIBS += msvcrt_winxp.obj
+endif
+endif
+
 ####################################################################
 #
 # Configuration for the release process
diff -ruN --strip-trailing-cr nss-3.13.6.orig/mozilla/nsprpub/pr/src/Makefile.in nss-3.13.6/mozilla/nsprpub/pr/src/Makefile.in
--- nss-3.13.6.orig/mozilla/nsprpub/pr/src/Makefile.in	2012-03-06 14:13:59 +0100
+++ nss-3.13.6/mozilla/nsprpub/pr/src/Makefile.in	2012-10-06 00:54:22 +0200
@@ -170,9 +170,17 @@
 ifdef NS_USE_GCC
 OS_LIBS		= -ladvapi32 -lwsock32 -lwinmm
 else
+ifdef WINDDK_BUILD
+ifdef USE_64
+OS_LIBS = advapi32.lib wsock32.lib winmm.lib msvcrt_win2003.obj
+else
+OS_LIBS = advapi32.lib wsock32.lib winmm.lib msvcrt_winxp.obj
+endif
+else
 OS_LIBS		= advapi32.lib wsock32.lib winmm.lib
 endif
 endif
+endif
 
 ifeq ($(OS_ARCH),WINCE)
 OS_LIBS		= ws2.lib
diff -ruN --strip-trailing-cr nss-3.13.6.orig/mozilla/nsprpub/pr/src/md/windows/ntmisc.c nss-3.13.6/mozilla/nsprpub/pr/src/md/windows/ntmisc.c
--- nss-3.13.6.orig/mozilla/nsprpub/pr/src/md/windows/ntmisc.c	2012-03-06 14:14:17 +0100
+++ nss-3.13.6/mozilla/nsprpub/pr/src/md/windows/ntmisc.c	2012-10-06 00:54:22 +0200
@@ -593,7 +593,11 @@
      */
     hasFdInheritBuffer = (attr && attr->fdInheritBuffer);
     if ((envp == NULL) && hasFdInheritBuffer) {
+#ifdef WINDDK_BUILD
+        envp = getenv;
+#else
         envp = environ;
+#endif
     }
 
     if (envp != NULL) {
diff -ruN --strip-trailing-cr nss-3.13.6.orig/mozilla/security/coreconf/WIN32.mk nss-3.13.6/mozilla/security/coreconf/WIN32.mk
--- nss-3.13.6.orig/mozilla/security/coreconf/WIN32.mk	2011-09-14 19:59:43 +0200
+++ nss-3.13.6/mozilla/security/coreconf/WIN32.mk	2012-10-06 00:54:22 +0200
@@ -146,6 +146,14 @@
     OS_CFLAGS += -W3 -nologo -D_CRT_SECURE_NO_WARNINGS \
 		 -D_CRT_NONSTDC_NO_WARNINGS
     OS_DLLFLAGS += -nologo -DLL -SUBSYSTEM:WINDOWS
+    ifdef WINDDK_BUILD
+        OS_CFLAGS += -DWINDDK_BUILD
+        ifdef USE_64
+            OS_LIBS += msvcrt_win2003.obj
+        else
+            OS_LIBS += msvcrt_winxp.obj
+        endif
+    endif
     ifeq ($(_MSC_VER),$(_MSC_VER_6))
     ifndef MOZ_DEBUG_SYMBOLS
 	OS_DLLFLAGS += -PDB:NONE
diff -ruN --strip-trailing-cr nss-3.13.6.orig/mozilla/security/coreconf/arch.mk nss-3.13.6/mozilla/security/coreconf/arch.mk
--- nss-3.13.6.orig/mozilla/security/coreconf/arch.mk	2009-06-05 04:14:49 +0200
+++ nss-3.13.6/mozilla/security/coreconf/arch.mk	2012-10-06 00:54:22 +0200
@@ -268,7 +268,15 @@
 # the uname.exe in the MSYS toolkit.
 #
 ifeq (MINGW32_NT,$(findstring MINGW32_NT,$(OS_ARCH)))
-    OS_RELEASE := $(patsubst MINGW32_NT-%,%,$(OS_ARCH))
+    ifdef WINDDK_BUILD
+        ifdef USE_64
+            OS_RELEASE := 5.2
+        else
+            OS_RELEASE := 5.1
+        endif
+    else
+        OS_RELEASE := $(patsubst MINGW32_NT-%,%,$(OS_ARCH))
+    endif
     OS_ARCH = WINNT
     USE_MSYS = 1
     ifndef CPU_ARCH
diff -ruN --strip-trailing-cr nss-3.13.6.orig/mozilla/security/nss/cmd/platlibs.mk nss-3.13.6/mozilla/security/nss/cmd/platlibs.mk
--- nss-3.13.6.orig/mozilla/security/nss/cmd/platlibs.mk	2010-06-12 02:58:33 +0200
+++ nss-3.13.6/mozilla/security/nss/cmd/platlibs.mk	2012-10-06 00:54:22 +0200
@@ -249,3 +249,11 @@
 endif
 
 JAR_LIBS = $(DIST)/lib/$(LIB_PREFIX)jar.$(LIB_SUFFIX)
+
+ifdef WINDDK_BUILD
+ifdef USE_64
+OS_LIBS += msvcrt_win2003.obj
+else
+OS_LIBS += msvcrt_winxp.obj
+endif
+endif
diff -ruN --strip-trailing-cr nss-3.13.6.orig/mozilla/security/nss/cmd/selfserv/selfserv.c nss-3.13.6/mozilla/security/nss/cmd/selfserv/selfserv.c
--- nss-3.13.6.orig/mozilla/security/nss/cmd/selfserv/selfserv.c	2012-03-01 19:38:24 +0100
+++ nss-3.13.6/mozilla/security/nss/cmd/selfserv/selfserv.c	2012-10-06 00:54:22 +0200
@@ -51,8 +51,13 @@
 #endif
 
 #if defined(_WINDOWS)
+#ifdef WINDDK_BUILD
+#include <windows.h>
+#define getpid GetCurrentProcessId
+#else
 #include <process.h>	/* for getpid() */
 #endif
+#endif
 
 #include <signal.h>
 #include <stdlib.h>
diff -ruN --strip-trailing-cr nss-3.13.6.orig/mozilla/security/nss/lib/freebl/mpi/mpcpucache.c nss-3.13.6/mozilla/security/nss/lib/freebl/mpi/mpcpucache.c
--- nss-3.13.6.orig/mozilla/security/nss/lib/freebl/mpi/mpcpucache.c	2011-09-30 18:07:16 +0200
+++ nss-3.13.6/mozilla/security/nss/lib/freebl/mpi/mpcpucache.c	2012-10-06 00:54:22 +0200
@@ -80,7 +80,11 @@
 
 #elif defined(_MSC_VER)
 
+#ifdef WINDDK_BUILD
+#include <ntddk.h>
+#else
 #include <intrin.h>
+#endif
 
 void freebl_cpuid(unsigned long op, unsigned long *eax, 
            unsigned long *ebx, unsigned long *ecx, 
diff -ruN --strip-trailing-cr nss-3.13.6.orig/mozilla/security/nss/lib/freebl/win_rand.c nss-3.13.6/mozilla/security/nss/lib/freebl/win_rand.c
--- nss-3.13.6.orig/mozilla/security/nss/lib/freebl/win_rand.c	2011-01-06 20:00:52 +0100
+++ nss-3.13.6/mozilla/security/nss/lib/freebl/win_rand.c	2012-10-06 00:54:22 +0200
@@ -50,6 +50,13 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #endif
+
+#ifdef WINDDK_BUILD
+#ifndef stat
+#define stat _stat
+#endif
+#endif
+
 #include <stdio.h>
 #include "prio.h"
 #include "prerror.h"
diff -ruN --strip-trailing-cr nss-3.13.6.orig/mozilla/security/nss/lib/softoken/legacydb/config.mk nss-3.13.6/mozilla/security/nss/lib/softoken/legacydb/config.mk
--- nss-3.13.6.orig/mozilla/security/nss/lib/softoken/legacydb/config.mk	2011-11-06 00:01:08 +0100
+++ nss-3.13.6/mozilla/security/nss/lib/softoken/legacydb/config.mk	2012-10-06 00:54:22 +0200
@@ -95,3 +95,11 @@
 ifeq ($(OS_TARGET),WINCE)
 DEFINES += -DDBM_USING_NSPR
 endif
+
+ifdef WINDDK_BUILD
+ifdef USE_64
+OS_LIBS += msvcrt_win2003.obj
+else
+OS_LIBS += msvcrt_winxp.obj
+endif
+endif
diff -ruN --strip-trailing-cr nss-3.13.6.orig/mozilla/security/nss/lib/sqlite/sqlite3.c nss-3.13.6/mozilla/security/nss/lib/sqlite/sqlite3.c
--- nss-3.13.6.orig/mozilla/security/nss/lib/sqlite/sqlite3.c	2010-01-08 06:42:38 +0100
+++ nss-3.13.6/mozilla/security/nss/lib/sqlite/sqlite3.c	2012-10-06 00:54:22 +0200
@@ -10980,7 +10980,8 @@
 ** localtime_s().
 */
 #if !defined(HAVE_LOCALTIME_R) && !defined(HAVE_LOCALTIME_S) && \
-     defined(_MSC_VER) && defined(_CRT_INSECURE_DEPRECATE)
+     defined(_MSC_VER) && defined(_CRT_INSECURE_DEPRECATE) && \
+     !defined(WINDDK_BUILD)
 #define HAVE_LOCALTIME_S 1
 #endif
 
diff -ruN --strip-trailing-cr nss-3.13.6.orig/mozilla/security/nss/lib/ssl/sslimpl.h nss-3.13.6/mozilla/security/nss/lib/ssl/sslimpl.h
--- nss-3.13.6.orig/mozilla/security/nss/lib/ssl/sslimpl.h	2012-02-15 22:52:08 +0100
+++ nss-3.13.6/mozilla/security/nss/lib/ssl/sslimpl.h	2012-10-06 00:54:22 +0200
@@ -1657,8 +1657,13 @@
 #elif defined(_WIN32_WCE)
 #define SSL_GETPID GetCurrentProcessId
 #elif defined(WIN32)
+#ifdef WINDDK_BUILD
+#include <windows.h>
+#define SSL_GETPID GetCurrentProcessId
+#else
 extern int __cdecl _getpid(void);
 #define SSL_GETPID _getpid
+#endif
 #else
 #define SSL_GETPID() 0
 #endif
diff -ruN --strip-trailing-cr nss-3.13.6.orig/mozilla/security/nss/lib/zlib/config.mk nss-3.13.6/mozilla/security/nss/lib/zlib/config.mk
--- nss-3.13.6.orig/mozilla/security/nss/lib/zlib/config.mk	2009-11-07 02:13:10 +0100
+++ nss-3.13.6/mozilla/security/nss/lib/zlib/config.mk	2012-10-06 00:54:22 +0200
@@ -46,3 +46,11 @@
 PROGRAM        =
 
 EXTRA_LIBS     = $(LIBRARY)
+
+ifdef WINDDK_BUILD
+ifdef USE_64
+OS_LIBS += msvcrt_win2003.obj
+else
+OS_LIBS += msvcrt_winxp.obj
+endif
+endif