~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/_dirstate_helpers_pyx.h

  • Committer: Robert Collins
  • Date: 2006-03-04 02:30:17 UTC
  • mto: (1594.2.4 integration)
  • mto: This revision was merged to the branch mainline in revision 1596.
  • Revision ID: robertc@robertcollins.net-20060304023017-7f5f460efff7d2e8
Make join cheaper for compatibly inconsistent parents.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
#ifndef _DIRSTATE_HELPERS_PYX_H
2
 
#define _DIRSTATE_HELPERS_PYX_H
3
 
 
4
 
/* for intptr_t */
5
 
#ifdef _MSC_VER
6
 
#include <io.h>
7
 
#else
8
 
 
9
 
#if defined(__SVR4) && defined(__sun)
10
 
#include <inttypes.h>
11
 
#else
12
 
#include <stdint.h>
13
 
#endif
14
 
 
15
 
#endif
16
 
 
17
 
#endif