← Back to branch summary

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

« back to all changes in this revision

Viewing changes to mozilla/nsprpub/config/now.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/config/now.c
38
38
#include <stdio.h>
39
39
#include <stdlib.h>
40
40
 
41
 
#if defined(VMS)
42
 
#include <sys/timeb.h>
43
 
#elif defined(XP_UNIX) || defined(XP_OS2) || defined(XP_BEOS)
 
41
#if defined(XP_UNIX) || defined(XP_OS2) || defined(XP_BEOS)
44
42
#include <sys/time.h>
45
 
#elif defined(WIN32)
 
43
#elif defined(_WIN32)
46
44
#include <windows.h>
47
45
#else
48
46
#error "Architecture not supported"
62
60
     * of this program and omit the library build time
63
61
     * in PRVersionDescription.
64
62
     */
65
 
#elif defined(VMS)
66
 
    long long now;
67
 
    struct timeb b;
68
 
    ftime(&b);
69
 
    now = b.time;
70
 
    now *= 1000000;
71
 
    now += (1000 * b.millitm);
72
 
    fprintf(stdout, "%Ld", now);
73
63
#elif defined(XP_UNIX) || defined(XP_OS2) || defined(XP_BEOS)
74
64
    long long now;
75
65
    struct timeval tv;
87
77
    fprintf(stdout, "%lld", now);
88
78
#endif
89
79
 
90
 
#elif defined(WIN32)
 
80
#elif defined(_WIN32)
91
81
    __int64 now;
92
82
    FILETIME ft;
93
83
    GetSystemTimeAsFileTime(&ft);