Skip to content

Fix compilation errors, add customizability #4

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

Open
nabijaczleweli wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix compilation errors, add customizability #4

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
722b909
Add include guards around SG_PATH_CHAR
nabijaczleweli Sep 14, 2015
7c994f2
Fix compilation error, where all symbols used in WinAPI are not defined
nabijaczleweli Sep 14, 2015
922aa1d
Also include <mbstring.h> with _MBCS defined
nabijaczleweli Sep 15, 2015
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
12 changes: 10 additions & 2 deletions SimpleGlob.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,11 @@ enum SG_Error {
// on Windows we want to use MBCS aware string functions and mimic the
// Unix glob functionality. On Unix we just use glob.
#ifdef _WIN32
# define WIN32_LEAN_AND_MEAN
# include <windows.h>
# define _MBCS
# include <mbstring.h>
# include <stdint.h>
# define sg_strchr ::_mbschr
# define sg_strrchr ::_mbsrchr
# define sg_strlen ::_mbslen
Expand Down Expand Up @@ -301,7 +305,9 @@ enum SG_FileType {
# define INVALID_FILE_ATTRIBUTES ((DWORD)-1)
#endif

#define SG_PATH_CHAR '\\'
#ifndef SG_PATH_CHAR
# define SG_PATH_CHAR '\\'
#endif

/*! @brief Windows glob implementation. */
template<class SOCHAR>
Expand Down Expand Up @@ -381,7 +387,9 @@ struct SimpleGlobBase

#else // !_WIN32

#define SG_PATH_CHAR '/'
#ifndef SG_PATH_CHAR
# define SG_PATH_CHAR '/'
#endif

/*! @brief Unix glob implementation. */
template<class SOCHAR>
Expand Down