diff options
| author | Cedric Schieli <cschieli@gmail.com> | 2010-06-01 12:37:47 +0000 |
|---|---|---|
| committer | Cedric Schieli <cschieli@gmail.com> | 2010-06-01 12:37:47 +0000 |
| commit | 10b8b99e48384b4470cac1330080c12d2ade01de (patch) | |
| tree | 7bb4ad6cd94a2c9a960fd9a4532d123eee5151d5 /main/nspr/nspr-4.7.0-prtime.patch | |
| parent | 9252f1cfd78299b137400ed8169a79f7f833daac (diff) | |
| parent | c6c0b6f9dbde1244e7b31f74c703178a867e873f (diff) | |
| download | aports-10b8b99e48384b4470cac1330080c12d2ade01de.tar.bz2 aports-10b8b99e48384b4470cac1330080c12d2ade01de.tar.xz | |
Merge remote branch 'upstream/master' into to-upstream
Diffstat (limited to 'main/nspr/nspr-4.7.0-prtime.patch')
| -rw-r--r-- | main/nspr/nspr-4.7.0-prtime.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/main/nspr/nspr-4.7.0-prtime.patch b/main/nspr/nspr-4.7.0-prtime.patch new file mode 100644 index 0000000000..74d5534d5a --- /dev/null +++ b/main/nspr/nspr-4.7.0-prtime.patch @@ -0,0 +1,26 @@ +--- a/mozilla/nsprpub/pr/src/misc/prtime.c.orig 2007-09-14 19:41:08.000000000 +0200 ++++ b/mozilla/nsprpub/pr/src/misc/prtime.c 2007-09-14 19:42:17.000000000 +0200 +@@ -1536,7 +1536,7 @@ + case TT_EET: zone_offset = 2 * 60; break; + case TT_JST: zone_offset = 9 * 60; break; + default: +- PR_ASSERT (0); ++ return PR_FAILURE; + break; + } + } +@@ -1578,11 +1578,12 @@ + struct tm localTime; + time_t secs; + +- PR_ASSERT(result->tm_month > -1 && ++ if (!(result->tm_month > -1 && + result->tm_mday > 0 && + result->tm_hour > -1 && + result->tm_min > -1 && +- result->tm_sec > -1); ++ result->tm_sec > -1)) ++ return PR_FAILURE; + + /* + * To obtain time_t from a tm structure representing the local |