← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/nspr/jaunty-security

« back to all changes in this revision

Viewing changes to mozilla/nsprpub/pr/include/prtime.h

  • Committer: Bazaar Package Importer
  • Author(s): Chris Coulson
  • Date: 2010-05-10 18:40:10 UTC
  • mfrom: (1.2.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20100510184010-boghfzlm551mtoag
Tags: 4.8-0ubuntu0.9.04.1
* New upstream release: 4.8
  - Support updating NSS to 3.12.6 and fix CVE-2009-3555 aka 
    US-CERT VU#120541
* adjust patches to changed upstream codebase
  - update debian/patches/30_config_64bits.patch
  - 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/include/prtime.h
115
115
typedef struct PRExplodedTime {
116
116
    PRInt32 tm_usec;                /* microseconds past tm_sec (0-99999)  */
117
117
    PRInt32 tm_sec;             /* seconds past tm_min (0-61, accomodating
118
 
                                   up to two leap seconds) */   
 
118
                                   up to two leap seconds) */
119
119
    PRInt32 tm_min;             /* minutes past tm_hour (0-59) */
120
120
    PRInt32 tm_hour;            /* hours past tm_day (0-23) */
121
121
    PRInt32 tm_mday;            /* days past tm_mon (1-31, note that it
126
126
 
127
127
    PRInt8 tm_wday;                     /* calculated day of the week
128
128
                                                (0-6, Sun = 0) */
129
 
    PRInt16 tm_yday;            /* calculated day of the year 
 
129
    PRInt16 tm_yday;            /* calculated day of the year
130
130
                                                (0-365, Jan 1 = 0) */
131
131
 
132
132
    PRTimeParameters tm_params;  /* time parameters used by conversion */
174
174
 * The implementation is machine dependent.
175
175
 * Cf. time_t time(time_t *tp) in ANSI C.
176
176
 */
177
 
#if defined(HAVE_WATCOM_BUG_2)
178
 
PRTime __pascal __export __loadds
179
 
#else
180
 
NSPR_API(PRTime) 
181
 
#endif
 
177
NSPR_API(PRTime)
182
178
PR_Now(void);
183
179
 
184
180
/*
195
191
    PRTime usecs, PRTimeParamFn params, PRExplodedTime *exploded);
196
192
 
197
193
/* Reverse operation of PR_ExplodeTime */
198
 
#if defined(HAVE_WATCOM_BUG_2)
199
 
PRTime __pascal __export __loadds
200
 
#else
201
 
NSPR_API(PRTime) 
202
 
#endif
 
194
NSPR_API(PRTime)
203
195
PR_ImplodeTime(const PRExplodedTime *exploded);
204
196
 
205
197
/*
298
290
#ifndef NO_NSPR_10_SUPPORT
299
291
 
300
292
/* Format a time value into a buffer. Same semantics as strftime() */
301
 
NSPR_API(PRUint32) PR_FormatTime(char *buf, int buflen, const char *fmt, 
 
293
NSPR_API(PRUint32) PR_FormatTime(char *buf, int buflen, const char *fmt,
302
294
                                           const PRExplodedTime *tm);
303
295
 
304
296
/* Format a time value into a buffer. Time is always in US English format, regardless