Rev 3900: Fix compilation error in _dirstate_helpers_c on SunOS/Solaris. (Jari in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

Canonical.com Patch Queue Manager pqm at pqm.ubuntu.com
Fri Dec 12 04:30:30 GMT 2008


At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 3900
revision-id: pqm at pqm.ubuntu.com-20081212043027-n6zyyf2q7usjiyid
parent: pqm at pqm.ubuntu.com-20081212025611-838ms79rnxjl7yr2
parent: andrew.bennetts at canonical.com-20081212035356-uqcu89gy4nqf017x
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2008-12-12 04:30:27 +0000
message:
  Fix compilation error in _dirstate_helpers_c on SunOS/Solaris. (Jari
  	Aalto)
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/_dirstate_helpers_c.h   _dirstate_helpers_c.-20070802205935-hqo9yzuzjix271dd-1
    ------------------------------------------------------------
    revno: 3899.1.1
    revision-id: andrew.bennetts at canonical.com-20081212035356-uqcu89gy4nqf017x
    parent: pqm at pqm.ubuntu.com-20081212025611-838ms79rnxjl7yr2
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: solaris-ifdef
    timestamp: Fri 2008-12-12 14:53:56 +1100
    message:
      Fix compilation error in _dirstate_helpers_c on SunOS/Solaris. (Jari Aalto)
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/_dirstate_helpers_c.h   _dirstate_helpers_c.-20070802205935-hqo9yzuzjix271dd-1
=== modified file 'NEWS'
--- a/NEWS	2008-12-12 01:47:30 +0000
+++ b/NEWS	2008-12-12 03:53:56 +0000
@@ -36,6 +36,9 @@
     * Don't call iteritems on transport_list_registry, because it may
       change during iteration.  (Martin Pool, #277048)
 
+    * Fix compilation error in ``_dirstate_helpers_c`` on SunOS/Solaris.
+      (Jari Aalto)
+
     * Fix SystemError in ``_patiencediff_c`` module by calling
       PyErr_NoMemory() before returning NULL in PatienceSequenceMatcher_new.
       (Andrew Bennetts, #303206)

=== modified file 'bzrlib/_dirstate_helpers_c.h'
--- a/bzrlib/_dirstate_helpers_c.h	2007-08-02 21:00:51 +0000
+++ b/bzrlib/_dirstate_helpers_c.h	2008-12-12 03:53:56 +0000
@@ -5,7 +5,13 @@
 #ifdef _MSC_VER
 #include <io.h>
 #else
+
+#if defined(__SVR4) && defined(__sun)
+#include <inttypes.h>
+#else
 #include <stdint.h>
 #endif
 
 #endif
+
+#endif




More information about the bazaar-commits mailing list