summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--msgpack/pack.h12
-rw-r--r--msgpack/unpack.h4
2 files changed, 2 insertions, 14 deletions
diff --git a/msgpack/pack.h b/msgpack/pack.h
index f3935fb..544950b 100644
--- a/msgpack/pack.h
+++ b/msgpack/pack.h
@@ -15,18 +15,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#if _MSC_VER
-typedef signed char uint8_t;
-typedef unsigned char uint8_t;
-typedef short int16_t;
-typedef unsigned short uint16_t;
-typedef int int32_t;
-typedef unsigned int uint32_t;
-typedef long long int64_t;
-typedef unsigned long long uint64_t;
-#else
-#include <stdint.h>
-#endif
#include <stddef.h>
#include <stdlib.h>
diff --git a/msgpack/unpack.h b/msgpack/unpack.h
index daeb54c..b753493 100644
--- a/msgpack/unpack.h
+++ b/msgpack/unpack.h
@@ -28,7 +28,7 @@ using namespace std;
struct array_context {
unsigned int size;
unsigned int last;
- stack_item(unsigned int size) : size(size), last(0)
+ array_context(unsigned int size) : size(size), last(0)
{}
};
struct unpack_user {
@@ -116,7 +116,7 @@ static inline int template_callback_false(unpack_user* u, msgpack_unpack_object*
static inline int template_callback_array(unpack_user* u, unsigned int n, msgpack_unpack_object* o)
{
if (n > 0) {
- u->array_stack.push(stack_item(n));
+ u->array_stack.push(array_context(n));
*o = PyList_New(n);
}
else {