~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: 2011-08-17 18:13:57 UTC
  • mfrom: (5268.7.29 transport-segments)
  • Revision ID: pqm@pqm.ubuntu.com-20110817181357-y5q5eth1hk8bl3om
(jelmer) Allow specifying the colocated branch to use in the branch URL,
 and retrieving the branch name using ControlDir._get_selected_branch.
 (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

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