Skip to content

Commit 20bdc73

Browse files
author
Andy C
committed
[cpp/libc] Fix to avoid conflict with CODESET macro
I'm pretty sure it's a #define in musl libc on Alpine, while it's not in glibc - Update oils-for-unix tarball version, so we fetch code with the latest fixes
1 parent d822d3e commit 20bdc73

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

cpp/libc.h

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,15 @@ int sleep_until_error(double seconds);
4141
// pylib/locale_.py
4242
namespace pylocale {
4343

44-
const int CODESET = ::CODESET;
45-
44+
constexpr int codeset = CODESET;
4645
constexpr int lc_all = LC_ALL;
4746
constexpr int lc_ctype = LC_CTYPE;
47+
#undef CODESET
4848
#undef LC_ALL
4949
#undef LC_CTYPE
50-
const int LC_ALL = lc_all;
51-
const int LC_CTYPE = lc_ctype;
50+
constexpr int CODESET = codeset;
51+
constexpr int LC_ALL = lc_all;
52+
constexpr int LC_CTYPE = lc_ctype;
5253

5354
class Error {
5455
public:

regtest/aports-setup.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ checkout-stable() {
6565
}
6666

6767
download-oils() {
68-
local job_id=${1:-9951} # 2025-08
68+
local job_id=${1:-10054} # 2025-08 - IFS fix and musl libc fix
6969

7070
local url="https://op.oilshell.org/uuu/github-jobs/$job_id/cpp-tarball.wwz/_release/oils-for-unix.tar"
7171

0 commit comments

Comments
 (0)