Skip to content

Commit

Permalink
Merge branch 'master' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
kiyo-masui committed Feb 10, 2017
2 parents 0571a17 + 6c4671f commit 6d97f15
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 6 deletions.
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

VERSION_MAJOR = 0
VERSION_MINOR = 3
VERSION_POINT = 1
VERSION_POINT = 2

# Only unset in the 'release' branch and in tags.
VERSION_DEV = 0
Expand Down
7 changes: 4 additions & 3 deletions src/bitshuffle_core.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,9 @@
#ifndef BITSHUFFLE_CORE_H
#define BITSHUFFLE_CORE_H

#if defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) /* C99 */
# include <stdint.h>
// We assume GNU g++ defining `__cplusplus` has stdint.h
#if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199900L) || defined(__cplusplus)
#include <stdint.h>
#else
typedef unsigned char uint8_t;
typedef unsigned short uint16_t;
Expand All @@ -46,7 +47,7 @@
#ifndef BSHUF_VERSION_MAJOR
#define BSHUF_VERSION_MAJOR 0
#define BSHUF_VERSION_MINOR 3
#define BSHUF_VERSION_POINT 0
#define BSHUF_VERSION_POINT 2
#endif

#ifdef __cplusplus
Expand Down
5 changes: 3 additions & 2 deletions src/bitshuffle_internals.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@
#ifndef BITSHUFFLE_INTERNALS_H
#define BITSHUFFLE_INTERNALS_H

#if defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) /* C99 */
# include <stdint.h>
// We assume GNU g++ defining `__cplusplus` has stdint.h
#if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199900L) || defined(__cplusplus)
#include <stdint.h>
#else
typedef unsigned char uint8_t;
typedef unsigned short uint16_t;
Expand Down

0 comments on commit 6d97f15

Please sign in to comment.