← Back to branch summary

~ubuntu-branches/ubuntu/quantal/nspr/quantal-security

« back to all changes in this revision

Viewing changes to mozilla/nsprpub/pr/tests/y2ktmo.c

  • Committer: Bazaar Package Importer
  • Author(s): Alexander Sack
  • Date: 2009-08-10 11:34:26 UTC
  • mfrom: (1.1.10 upstream)
  • Revision ID: james.westby@ubuntu.com-20090810113426-3uv4diflrkcbdimm
Tags: 4.8-0ubuntu1
https://launchpad.net/bugs/387812
* New upstream release: 4.8 (LP: #387812)
* adjust patches to changed upstreanm codebase
  - update debian/patches/99_configure.patch
* update shlibs symbols to include new API elements
  - update debian/libnspr4-0d.symbols

Show diffs side-by-side

added added

removed removed

Lines of Context:
mozilla/nsprpub/pr/tests/y2ktmo.c
71
71
#if defined(XP_UNIX)
72
72
#include <sys/time.h> /* for gettimeofday */
73
73
#endif
74
 
#if defined(WIN32)
 
74
#if defined(WIN32) && !defined(WINCE)
75
75
#include <sys/types.h>
76
76
#include <sys/timeb.h>  /* for _ftime */
77
77
#endif
89
89
static struct timeval start_time_tv;
90
90
#endif
91
91
#if defined(WIN32)
 
92
#if defined(WINCE)
 
93
static DWORD start_time_tick;
 
94
#else
92
95
static struct _timeb start_time_tb;
93
96
#endif
 
97
#endif
94
98
 
95
99
static void SleepThread(void *arg)
96
100
{
103
107
#if defined(XP_UNIX)
104
108
    struct timeval end_time_tv;
105
109
#endif
106
 
#if defined(WIN32)
 
110
#if defined(WIN32) && !defined(WINCE)
107
111
    struct _timeb end_time_tb;
108
112
#endif
109
113
 
122
126
            + (end_time_tv.tv_usec - start_time_tv.tv_usec)/1000;
123
127
#endif
124
128
#if defined(WIN32)
 
129
#if defined(WINCE)
 
130
    elapsed_msecs = GetTickCount() - start_time_tick;
 
131
#else
125
132
    _ftime(&end_time_tb);
126
133
    elapsed_msecs = 1000*(end_time_tb.time - start_time_tb.time)
127
134
            + (end_time_tb.millitm - start_time_tb.millitm);
128
135
#endif
 
136
#endif
129
137
#if defined(XP_UNIX) || defined(WIN32)
130
138
    if (elapsed_msecs + tolerance_msecs < timeout_msecs
131
139
            || elapsed_msecs > timeout_msecs + tolerance_msecs) {
150
158
#if defined(XP_UNIX)
151
159
    struct timeval end_time_tv;
152
160
#endif
153
 
#if defined(WIN32)
 
161
#if defined(WIN32) && !defined(WINCE)
154
162
    struct _timeb end_time_tb;
155
163
#endif
156
164
    PRFileDesc *sock;
190
198
            + (end_time_tv.tv_usec - start_time_tv.tv_usec)/1000;
191
199
#endif
192
200
#if defined(WIN32)
 
201
#if defined(WINCE)
 
202
    elapsed_msecs = GetTickCount() - start_time_tick;
 
203
#else
193
204
    _ftime(&end_time_tb);
194
205
    elapsed_msecs = 1000*(end_time_tb.time - start_time_tb.time)
195
206
            + (end_time_tb.millitm - start_time_tb.millitm);
196
207
#endif
 
208
#endif
197
209
#if defined(XP_UNIX) || defined(WIN32)
198
210
    if (elapsed_msecs + tolerance_msecs < timeout_msecs
199
211
            || elapsed_msecs > timeout_msecs + tolerance_msecs) {
222
234
#if defined(XP_UNIX)
223
235
    struct timeval end_time_tv;
224
236
#endif
225
 
#if defined(WIN32)
 
237
#if defined(WIN32) && !defined(WINCE)
226
238
    struct _timeb end_time_tb;
227
239
#endif
228
240
    PRFileDesc *sock;
265
277
            + (end_time_tv.tv_usec - start_time_tv.tv_usec)/1000;
266
278
#endif
267
279
#if defined(WIN32)
 
280
#if defined(WINCE)
 
281
    elapsed_msecs = GetTickCount() - start_time_tick;
 
282
#else
268
283
    _ftime(&end_time_tb);
269
284
    elapsed_msecs = 1000*(end_time_tb.time - start_time_tb.time)
270
285
            + (end_time_tb.millitm - start_time_tb.millitm);
271
286
#endif
 
287
#endif
272
288
#if defined(XP_UNIX) || defined(WIN32)
273
289
    if (elapsed_msecs + tolerance_msecs < timeout_msecs
274
290
            || elapsed_msecs > timeout_msecs + tolerance_msecs) {
297
313
#if defined(XP_UNIX)
298
314
    struct timeval end_time_tv;
299
315
#endif
300
 
#if defined(WIN32)
 
316
#if defined(WIN32) && !defined(WINCE)
301
317
    struct _timeb end_time_tb;
302
318
#endif
303
319
    PRLock *ml;
327
343
            + (end_time_tv.tv_usec - start_time_tv.tv_usec)/1000;
328
344
#endif
329
345
#if defined(WIN32)
 
346
#if defined(WINCE)
 
347
    elapsed_msecs = GetTickCount() - start_time_tick;
 
348
#else
330
349
    _ftime(&end_time_tb);
331
350
    elapsed_msecs = 1000*(end_time_tb.time - start_time_tb.time)
332
351
            + (end_time_tb.millitm - start_time_tb.millitm);
333
352
#endif
 
353
#endif
334
354
#if defined(XP_UNIX) || defined(WIN32)
335
355
    if (elapsed_msecs + tolerance_msecs < timeout_msecs
336
356
            || elapsed_msecs > timeout_msecs + tolerance_msecs) {
357
377
#if defined(XP_UNIX)
358
378
    struct timeval end_time_tv;
359
379
#endif
360
 
#if defined(WIN32)
 
380
#if defined(WIN32) && !defined(WINCE)
361
381
    struct _timeb end_time_tb;
362
382
#endif
363
383
    PRMonitor *mon;
381
401
            + (end_time_tv.tv_usec - start_time_tv.tv_usec)/1000;
382
402
#endif
383
403
#if defined(WIN32)
 
404
#if defined(WINCE)
 
405
    elapsed_msecs = GetTickCount() - start_time_tick;
 
406
#else
384
407
    _ftime(&end_time_tb);
385
408
    elapsed_msecs = 1000*(end_time_tb.time - start_time_tb.time)
386
409
            + (end_time_tb.millitm - start_time_tb.millitm);
387
410
#endif
 
411
#endif
388
412
#if defined(XP_UNIX) || defined(WIN32)
389
413
    if (elapsed_msecs + tolerance_msecs < timeout_msecs
390
414
            || elapsed_msecs > timeout_msecs + tolerance_msecs) {
410
434
#if defined(XP_UNIX)
411
435
    struct timeval end_time_tv;
412
436
#endif
413
 
#if defined(WIN32)
 
437
#if defined(WIN32) && !defined(WINCE)
414
438
    struct _timeb end_time_tb;
415
439
#endif
416
440
    int dummy;
429
453
            + (end_time_tv.tv_usec - start_time_tv.tv_usec)/1000;
430
454
#endif
431
455
#if defined(WIN32)
 
456
#if defined(WINCE)
 
457
    elapsed_msecs = GetTickCount() - start_time_tick;
 
458
#else
432
459
    _ftime(&end_time_tb);
433
460
    elapsed_msecs = 1000*(end_time_tb.time - start_time_tb.time)
434
461
            + (end_time_tb.millitm - start_time_tb.millitm);
435
462
#endif
 
463
#endif
436
464
#if defined(XP_UNIX) || defined(WIN32)
437
465
    if (elapsed_msecs + tolerance_msecs < timeout_msecs
438
466
            || elapsed_msecs > timeout_msecs + tolerance_msecs) {
507
535
    gettimeofday(&start_time_tv, NULL);
508
536
#endif
509
537
#if defined(WIN32)
 
538
#ifdef WINCE
 
539
    start_time_tick = GetTickCount();
 
540
#else
510
541
    _ftime(&start_time_tb);
511
542
#endif
 
543
#endif
512
544
    tolerance = PR_MillisecondsToInterval(tolerance_msecs);
513
545
 
514
546
    threads = PR_Malloc(