diff options
| author | Wan-Teh Chang <wtc@google.com> | 2015-12-23 20:30:41 -0800 |
|---|---|---|
| committer | Wan-Teh Chang <wtc@google.com> | 2015-12-23 20:30:41 -0800 |
| commit | a2db726e61cadc68339a145b89dd4251a1f4b87a (patch) | |
| tree | efaccd267e40cf39019d4449dac583d4f98e5efd | |
| parent | 5f66c221194cfcc6c4f237452360700a2621145d (diff) | |
| download | nss-hg-a2db726e61cadc68339a145b89dd4251a1f4b87a.tar.gz | |
Bug 1180095: Use PR_INT64() or PR_UINT64() instead of LL_INIT().
r=franziskuskiefer
| -rwxr-xr-x | lib/libpkix/pkix/util/pkix_tools.h | 4 | ||||
| -rw-r--r-- | lib/util/dertime.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/libpkix/pkix/util/pkix_tools.h b/lib/libpkix/pkix/util/pkix_tools.h index 1a4689da7..5a8ef2741 100755 --- a/lib/libpkix/pkix/util/pkix_tools.h +++ b/lib/libpkix/pkix/util/pkix_tools.h @@ -1458,8 +1458,8 @@ extern const char *PKIX_ERRORCLASSNAMES[PKIX_NUMERRORCLASSES]; extern PRLogModuleInfo *pkixLog; -#define PKIX_MAGIC_HEADER LL_INIT(0xFEEDC0FF, 0xEEFACADE) -#define PKIX_MAGIC_HEADER_DESTROYED LL_INIT(0xBAADF00D, 0xDEADBEEF) +#define PKIX_MAGIC_HEADER PR_UINT64(0xFEEDC0FFEEFACADE) +#define PKIX_MAGIC_HEADER_DESTROYED PR_UINT64(0xBAADF00DDEADBEEF) /* see source file for function documentation */ diff --git a/lib/util/dertime.c b/lib/util/dertime.c index 3a2782771..c196abbfc 100644 --- a/lib/util/dertime.c +++ b/lib/util/dertime.c @@ -19,10 +19,10 @@ p += 2; \ } -static const PRTime January1st1 = (PRTime) LL_INIT(0xff234001U, 0x00d44000U); -static const PRTime January1st1950 = (PRTime) LL_INIT(0xfffdc1f8U, 0x793da000U); -static const PRTime January1st2050 = LL_INIT(0x0008f81e, 0x1b098000); -static const PRTime January1st10000 = LL_INIT(0x0384440c, 0xcc736000); +static const PRTime January1st1 = PR_INT64(0xff23400100d44000); +static const PRTime January1st1950 = PR_INT64(0xfffdc1f8793da000); +static const PRTime January1st2050 = PR_INT64(0x0008f81e1b098000); +static const PRTime January1st10000 = PR_INT64(0x0384440ccc736000); /* gmttime must contains UTC time in micro-seconds unit */ SECStatus |