Merge branch 'master' of ssh://git.code.sf.net/p/tuxpaint/tuxpaint
This commit is contained in:
commit
16cc3e05b5
1 changed files with 12 additions and 0 deletions
|
|
@ -328,6 +328,7 @@ typedef struct safer_dirent
|
||||||
|
|
||||||
/* Windows */
|
/* Windows */
|
||||||
|
|
||||||
|
#include <windows.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <dirent.h>
|
#include <dirent.h>
|
||||||
#include <malloc.h>
|
#include <malloc.h>
|
||||||
|
|
@ -336,6 +337,9 @@ typedef struct safer_dirent
|
||||||
#include <direct.h>
|
#include <direct.h>
|
||||||
#include <iconv.h>
|
#include <iconv.h>
|
||||||
|
|
||||||
|
#undef min
|
||||||
|
#undef max
|
||||||
|
|
||||||
#define mkdir(path,access) _mkdir(path)
|
#define mkdir(path,access) _mkdir(path)
|
||||||
|
|
||||||
static void mtw(wchar_t * wtok, char *tok, size_t size)
|
static void mtw(wchar_t * wtok, char *tok, size_t size)
|
||||||
|
|
@ -365,6 +369,14 @@ static void mtw(wchar_t * wtok, char *tok, size_t size)
|
||||||
extern int win32_trash(const char *path);
|
extern int win32_trash(const char *path);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#undef iswprint
|
||||||
|
int iswprint(wchar_t wc)
|
||||||
|
{
|
||||||
|
WORD t;
|
||||||
|
GetStringTypeW(CT_CTYPE1, &wc, 1, &t);
|
||||||
|
return (t & C1_DEFINED) && !(t & C1_CNTRL);
|
||||||
|
}
|
||||||
|
|
||||||
#endif /* WIN32 */
|
#endif /* WIN32 */
|
||||||
|
|
||||||
#if defined(__MACOS__)
|
#if defined(__MACOS__)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue