OLD | NEW |
| (Empty) |
1 Index: mozilla/nsprpub/pr/include/prlog.h | |
2 =================================================================== | |
3 RCS file: /cvsroot/mozilla/nsprpub/pr/include/prlog.h,v | |
4 retrieving revision 3.16 | |
5 diff -p -u -8 -r3.16 prlog.h | |
6 --- mozilla/nsprpub/pr/include/prlog.h 22 Feb 2009 19:56:13 -0000 3.16 | |
7 +++ mozilla/nsprpub/pr/include/prlog.h 15 Jan 2010 01:33:24 -0000 | |
8 @@ -184,16 +184,18 @@ NSPR_API(void) PR_SetLogBuffering(PRIntn | |
9 */ | |
10 NSPR_API(void) PR_LogPrint(const char *fmt, ...); | |
11 | |
12 /* | |
13 ** Flush the log to its file. | |
14 */ | |
15 NSPR_API(void) PR_LogFlush(void); | |
16 | |
17 +NSPR_API(void) PR_Assert(const char *s, const char *file, PRIntn ln); | |
18 + | |
19 #if defined(DEBUG) || defined(FORCE_PR_LOG) | |
20 #define PR_LOGGING 1 | |
21 | |
22 #define PR_LOG_TEST(_module,_level) \ | |
23 ((_module)->level >= (_level)) | |
24 | |
25 /* | |
26 ** Log something. | |
27 @@ -228,17 +230,16 @@ NSPR_API(void) PR_LogFlush(void); | |
28 #define PR_LOG_END(module,level,args) | |
29 #define PR_LOG_DEFINE(_name) NULL | |
30 #endif /* PR_LOGGING */ | |
31 | |
32 #endif /* NO_NSPR_10_SUPPORT */ | |
33 | |
34 #if defined(DEBUG) || defined(FORCE_PR_ASSERT) | |
35 | |
36 -NSPR_API(void) PR_Assert(const char *s, const char *file, PRIntn ln); | |
37 #define PR_ASSERT(_expr) \ | |
38 ((_expr)?((void)0):PR_Assert(# _expr,__FILE__,__LINE__)) | |
39 | |
40 #define PR_NOT_REACHED(_reasonStr) \ | |
41 PR_Assert(_reasonStr,__FILE__,__LINE__) | |
42 | |
43 #else | |
44 | |
45 Index: mozilla/nsprpub/pr/src/md/windows/w95sock.c | |
46 =================================================================== | |
47 RCS file: /cvsroot/mozilla/nsprpub/pr/src/md/windows/w95sock.c,v | |
48 retrieving revision 3.16 | |
49 diff -p -u -8 -r3.16 w95sock.c | |
50 --- mozilla/nsprpub/pr/src/md/windows/w95sock.c 4 Feb 2009 23:44:01 -0000
3.16 | |
51 +++ mozilla/nsprpub/pr/src/md/windows/w95sock.c 15 Jan 2010 01:33:24 -0000 | |
52 @@ -67,17 +67,17 @@ static PRInt32 socket_io_wait( | |
53 | |
54 typedef enum _WSA_COMPATIBILITY_BEHAVIOR_ID { | |
55 WsaBehaviorAll = 0, | |
56 WsaBehaviorReceiveBuffering, | |
57 WsaBehaviorAutoTuning | |
58 } WSA_COMPATIBILITY_BEHAVIOR_ID, *PWSA_COMPATIBILITY_BEHAVIOR_ID; | |
59 | |
60 /* from sdkddkver.h */ | |
61 -#define NTDDI_LONGHORN 0x06000000 | |
62 +#define NTDDI_WIN6 0x06000000 /* Windows Vista */ | |
63 | |
64 /* from winsock2.h */ | |
65 #define WSAEVENT HANDLE | |
66 | |
67 #define WSAOVERLAPPED OVERLAPPED | |
68 typedef struct _OVERLAPPED * LPWSAOVERLAPPED; | |
69 | |
70 typedef void (CALLBACK * LPWSAOVERLAPPED_COMPLETION_ROUTINE)( | |
71 @@ -170,17 +170,17 @@ _PR_MD_SOCKET(int af, int type, int flag | |
72 if ((af == AF_INET || af == AF_INET6) && | |
73 type == SOCK_STREAM && socketSetCompatMode) | |
74 { | |
75 WSA_COMPATIBILITY_MODE mode; | |
76 char dummy[4]; | |
77 int ret_dummy; | |
78 | |
79 mode.BehaviorId = WsaBehaviorAutoTuning; | |
80 - mode.TargetOsVersion = NTDDI_LONGHORN; | |
81 + mode.TargetOsVersion = NTDDI_WIN6; | |
82 if (wsaioctlProc(sock, SIO_SET_COMPATIBILITY_MODE, | |
83 (char *)&mode, sizeof(mode), | |
84 dummy, 4, &ret_dummy, 0, NULL) == SOCKET_ERROR) | |
85 { | |
86 int err = WSAGetLastError(); | |
87 PR_LOG(_pr_io_lm, PR_LOG_DEBUG, ("WSAIoctl() failed with %d", err))
; | |
88 | |
89 /* SIO_SET_COMPATIBILITY_MODE may not be supported. | |
OLD | NEW |