Skip to content

Commit e7d7eb0

Browse files
authored
Merge branch 'main' into excel-border-hair
2 parents 25ad970 + 9a607e2 commit e7d7eb0

File tree

3 files changed

+23
-14
lines changed

3 files changed

+23
-14
lines changed

pandas/_libs/src/headers/portable.h

+8
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,16 @@
11
#ifndef _PANDAS_PORTABLE_H_
22
#define _PANDAS_PORTABLE_H_
33

4+
// To get `strdup` from strings.h
5+
#ifndef _XOPEN_SOURCE
6+
#define _XOPEN_SOURCE 600
7+
#endif
8+
9+
#include <string.h>
10+
411
#if defined(_MSC_VER)
512
#define strcasecmp( s1, s2 ) _stricmp( s1, s2 )
13+
#define strdup _strdup
614
#endif
715

816
// GH-23516 - works around locale perf issues

pandas/_libs/src/ujson/lib/ultrajson.h

+1
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ tree doesn't have cyclic references.
5454

5555
#include <stdio.h>
5656
#include <wchar.h>
57+
#include "../../headers/portable.h"
5758

5859
// Don't output any extra whitespaces when encoding
5960
#define JSON_NO_EXTRA_WHITESPACE

web/pandas/versions.json

+14-14
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,37 @@
11
[
22
{
33
"name": "dev",
4-
"version": "dev",
5-
"url": "https://pandas.pydata.org/docs/dev/"
4+
"version": "docs/dev",
5+
"url": "/docs/dev/"
66
},
77
{
88
"name": "1.5 (stable)",
9-
"version": "1.5 (stable)",
10-
"url": "https://pandas.pydata.org/docs/"
9+
"version": "docs",
10+
"url": "/docs/"
1111
},
1212
{
1313
"name": "1.4",
14-
"version": "1.4",
15-
"url": "https://pandas.pydata.org/pandas-docs/version/1.4/"
14+
"version": "pandas-docs/version/1.4",
15+
"url": "/pandas-docs/version/1.4/"
1616
},
1717
{
1818
"name": "1.3",
19-
"version": "1.3",
20-
"url": "https://pandas.pydata.org/pandas-docs/version/1.3/"
19+
"version": "pandas-docs/version/1.3",
20+
"url": "/pandas-docs/version/1.3/"
2121
},
2222
{
2323
"name": "1.2",
24-
"version": "1.2",
25-
"url": "https://pandas.pydata.org/pandas-docs/version/1.2/"
24+
"version": "pandas-docs/version/1.2",
25+
"url": "/pandas-docs/version/1.2/"
2626
},
2727
{
2828
"name": "1.1",
29-
"version": "1.1",
30-
"url": "https://pandas.pydata.org/pandas-docs/version/1.1/"
29+
"version": "pandas-docs/version/1.1",
30+
"url": "/pandas-docs/version/1.1/"
3131
},
3232
{
3333
"name": "1.0",
34-
"version": "1.0",
35-
"url": "https://pandas.pydata.org/pandas-docs/version/1.0/"
34+
"version": "pandas-docs/version/1.0",
35+
"url": "/pandas-docs/version/1.0/"
3636
}
3737
]

0 commit comments

Comments
 (0)