Skip to content

Commit dc491f5

Browse files
committed
BLD: fix mingw32 build
1 parent 4a6fd01 commit dc491f5

File tree

2 files changed

+25
-16
lines changed

2 files changed

+25
-16
lines changed

doc/source/faq.rst

+11
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,14 @@
55
Frequently Asked Questions (FAQ)
66
********************************
77

8+
Migrating from scikits.timeseries to pandas >= 0.8.0
9+
----------------------------------------------------
10+
11+
.. csv-table::
12+
:header: "scikits.timeseries", "pandas", "Notes"
13+
:widths: 20, 20, 60
14+
15+
Date, Period,
16+
DateArray, PeriodIndex,
17+
convert, resample,
18+
convert_to_annual, pivot_annual,

pandas/src/ujson/lib/ultrajson.h

+14-16
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ Encoder notes:
4242
------------------
4343
4444
:: Cyclic references ::
45-
Cyclic referenced objects are not detected.
46-
Set JSONObjectEncoder.recursionMax to suitable value or make sure input object
45+
Cyclic referenced objects are not detected.
46+
Set JSONObjectEncoder.recursionMax to suitable value or make sure input object
4747
tree doesn't have cyclic references.
4848
4949
*/
@@ -80,9 +80,7 @@ Dictates and limits how much stack space for buffers UltraJSON will use before r
8080
typedef __int64 JSINT64;
8181
typedef unsigned __int64 JSUINT64;
8282

83-
#ifndef __MINGW32__
8483
typedef unsigned __int32 uint32_t;
85-
#endif
8684
typedef __int32 JSINT32;
8785
typedef uint32_t JSUINT32;
8886
typedef unsigned __int8 JSUINT8;
@@ -93,7 +91,7 @@ typedef __int64 JSLONG;
9391
#define EXPORTFUNCTION __declspec(dllexport)
9492

9593
#define FASTCALL_MSVC __fastcall
96-
#define FASTCALL_ATTR
94+
#define FASTCALL_ATTR
9795
#define INLINE_PREFIX __inline
9896

9997
#else
@@ -105,7 +103,7 @@ typedef u_int64_t JSUINT64;
105103
typedef int32_t JSINT32;
106104
typedef u_int32_t JSUINT32;
107105

108-
#define FASTCALL_MSVC
106+
#define FASTCALL_MSVC
109107
#define FASTCALL_ATTR __attribute__((fastcall))
110108
#define INLINE_PREFIX inline
111109

@@ -144,7 +142,7 @@ enum JSTYPES
144142
JT_DOUBLE, //(double)
145143
JT_UTF8, //(char 8-bit)
146144
JT_ARRAY, // Array structure
147-
JT_OBJECT, // Key/Value structure
145+
JT_OBJECT, // Key/Value structure
148146
JT_INVALID, // Internal, do not return nor expect
149147
};
150148

@@ -179,8 +177,8 @@ typedef struct __JSONObjectEncoder
179177
double (*getDoubleValue)(JSOBJ obj, JSONTypeContext *tc);
180178

181179
/*
182-
Begin iteration of an iteratable object (JS_ARRAY or JS_OBJECT)
183-
Implementor should setup iteration state in ti->prv
180+
Begin iteration of an iteratable object (JS_ARRAY or JS_OBJECT)
181+
Implementor should setup iteration state in ti->prv
184182
*/
185183
JSPFN_ITERBEGIN iterBegin;
186184

@@ -201,20 +199,20 @@ typedef struct __JSONObjectEncoder
201199
The is responsible for the life-cycle of the returned string. Use iterNext/iterEnd and ti->prv to keep track of current object
202200
*/
203201
JSPFN_ITERGETVALUE iterGetValue;
204-
202+
205203
/*
206-
Return name of iterator.
204+
Return name of iterator.
207205
The is responsible for the life-cycle of the returned string. Use iterNext/iterEnd and ti->prv to keep track of current object
208206
*/
209207
JSPFN_ITERGETNAME iterGetName;
210-
208+
211209
/*
212210
Release a value as indicated by setting ti->release = 1 in the previous getValue call.
213211
The ti->prv array should contain the necessary context to release the value
214212
*/
215213
void (*releaseObject)(JSOBJ obj);
216214

217-
/* Library functions
215+
/* Library functions
218216
Set to NULL to use STDLIB malloc,realloc,free */
219217
JSPFN_MALLOC malloc;
220218
JSPFN_REALLOC realloc;
@@ -258,11 +256,11 @@ buffer - Preallocated buffer to store result in. If NULL function allocates own
258256
cbBuffer - Length of buffer (ignored if buffer is NULL)
259257
260258
Returns:
261-
Encoded JSON object as a null terminated char string.
259+
Encoded JSON object as a null terminated char string.
262260
263261
NOTE:
264-
If the supplied buffer wasn't enough to hold the result the function will allocate a new buffer.
265-
Life cycle of the provided buffer must still be handled by caller.
262+
If the supplied buffer wasn't enough to hold the result the function will allocate a new buffer.
263+
Life cycle of the provided buffer must still be handled by caller.
266264
267265
If the return value doesn't equal the specified buffer caller must release the memory using
268266
JSONObjectEncoder.free or free() as specified when calling this function.

0 commit comments

Comments
 (0)