Skip to content

Optimize conditional compilation: replace __APPLE__/__linux__ checks with unified _WIN32 check #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xiaoyifang merged 4 commits into from
Jun 16, 2026
Merged

Optimize conditional compilation: replace __APPLE__/__linux__ checks with unified _WIN32 check #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0ec317d
Merge custom_unistd.h into build-pre.h
xiaoyifang Jun 16, 2026
b03dcc5
[autofix.ci] apply automated fixes
autofix-ci[bot] Jun 16, 2026
1610f35
Optimize conditional compilation: replace __APPLE__/__linux__ checks …
xiaoyifang Jun 16, 2026
378d8b3
[autofix.ci] apply automated fixes
autofix-ci[bot] Jun 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ cmake_minimum_required(VERSION 3.22)
project(eb VERSION 1.0.0 LANGUAGES C)

set(SOURCES
custom_unistd.h
appendix.c
appendix.h
appsub.c
Expand Down
4 changes: 2 additions & 2 deletions build-post.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ extern "C" {
#endif
#include "defs.h"

#if defined( __APPLE__) || defined(__linux__)
#include <dirent.h>
#ifndef _WIN32
#include <dirent.h>
#else
#include "win_dirent.h"
#endif
Expand Down
11 changes: 10 additions & 1 deletion build-pre.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,16 @@
#include <stdlib.h>
#include <stdarg.h>
#include <limits.h>
#include "custom_unistd.h"
/*
* Platform abstraction for unistd.h.
* unistd.h maps (roughly) to io.h on Windows.
*/
#if defined(_WIN32)
#include <io.h>
#include <process.h>
#else
#include <unistd.h>
#endif
#include <fcntl.h>

#if defined( _WIN32 )
Expand Down
14 changes: 0 additions & 14 deletions custom_unistd.h
View file
Open in desktop

This file was deleted.

7 changes: 3 additions & 4 deletions filename.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,10 @@

#include "build-post.h"


#if defined( __APPLE__) || defined(__linux__)
#include <dirent.h>
#else
#ifdef _WIN32
#include "win_dirent.h"
#else
#include <dirent.h>
#endif


Expand Down
1 change: 0 additions & 1 deletion zio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
*/

#include "build-pre.h"
#include "custom_unistd.h"
#include <errno.h>
#include <fcntl.h>
#include <limits.h>
Expand Down
Loading