← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/_dirstate_helpers_pyx.h

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-01-21 10:00:42 UTC
  • mfrom: (4978.1.2 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20100121100042-77858a88k2zpec7b
(nmb) Add documentation for multi-parent merges

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/_dirstate_helpers_pyx.h
 
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