← Back to branch summary

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

« back to all changes in this revision

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

  • Committer: Bazaar Package Importer
  • Author(s): Alexander Sack
  • Date: 2009-06-16 11:28:24 UTC
  • mfrom: (1.1.9 upstream)
  • Revision ID: james.westby@ubuntu.com-20090616112824-cg6qzhvt63lx7bub
Tags: 4.7.5-0ubuntu1
https://launchpad.net/bugs/387745
* New upstream version: 4.7.5 (LP: #387745)

* adjust patches to changed upstream code base
  - update debian/patches/99_configure.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
mozilla/nsprpub/pr/include/prtypes.h
387
387
**      the LL_ macros (see prlong.h).
388
388
************************************************************************/
389
389
#ifdef HAVE_LONG_LONG
390
 
#if PR_BYTES_PER_LONG == 8
 
390
/* Keep this in sync with prlong.h. */
 
391
/*
 
392
 * On 64-bit Mac OS X, uint64 needs to be defined as unsigned long long to
 
393
 * match uint64_t, otherwise our uint64 typedef conflicts with the uint64
 
394
 * typedef in cssmconfig.h, which CoreServices.h includes indirectly.
 
395
 */
 
396
#if PR_BYTES_PER_LONG == 8 && !defined(__APPLE__)
391
397
typedef long PRInt64;
392
398
typedef unsigned long PRUint64;
393
399
#elif defined(WIN16)