mirror of
https://github.com/aseprite/aseprite.git
synced 2025-02-15 21:40:34 +00:00
Fixed some compilations problems in Linux. And a bug in file_system to get the root / file-item
key.
This commit is contained in:
parent
528eaab937
commit
685ec05e3f
@ -73,6 +73,10 @@
|
|||||||
#define FA_TO_SHOW FA_RDONLY | FA_DIREC | FA_ARCH | FA_SYSTEM
|
#define FA_TO_SHOW FA_RDONLY | FA_DIREC | FA_ARCH | FA_SYSTEM
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef MAX_PATH
|
||||||
|
# define MAX_PATH 4096
|
||||||
|
#endif
|
||||||
|
|
||||||
/* a position in the file-system */
|
/* a position in the file-system */
|
||||||
struct FileItem
|
struct FileItem
|
||||||
{
|
{
|
||||||
@ -912,6 +916,10 @@ static char *remove_backslash(char *filename)
|
|||||||
removed */
|
removed */
|
||||||
if (len == 3 && filename[1] == DEVICE_SEPARATOR)
|
if (len == 3 && filename[1] == DEVICE_SEPARATOR)
|
||||||
return filename;
|
return filename;
|
||||||
|
#else
|
||||||
|
/* this is just the root '/' slash */
|
||||||
|
if (len == 1)
|
||||||
|
return filename;
|
||||||
#endif
|
#endif
|
||||||
filename[len-1] = 0;
|
filename[len-1] = 0;
|
||||||
}
|
}
|
||||||
|
@ -39,6 +39,10 @@
|
|||||||
# define HAVE_DRIVES
|
# define HAVE_DRIVES
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef MAX_PATH
|
||||||
|
# define MAX_PATH 4096
|
||||||
|
#endif
|
||||||
|
|
||||||
/* Variables used only to maintain the history of navigation. */
|
/* Variables used only to maintain the history of navigation. */
|
||||||
static JLink navigation_position = NULL; /* current position in the navigation history */
|
static JLink navigation_position = NULL; /* current position in the navigation history */
|
||||||
static JList navigation_history = NULL; /* set of FileItems navigated */
|
static JList navigation_history = NULL; /* set of FileItems navigated */
|
||||||
|
@ -52,14 +52,14 @@
|
|||||||
|
|
||||||
#if defined UNIX_LIKE
|
#if defined UNIX_LIKE
|
||||||
struct pthread_proxy_data {
|
struct pthread_proxy_data {
|
||||||
void (*proc)(JThread thread, void *data);
|
void (*proc)(void *data);
|
||||||
void *data;
|
void *data;
|
||||||
};
|
};
|
||||||
|
|
||||||
static void *pthread_proxy(void *arg)
|
static void *pthread_proxy(void *arg)
|
||||||
{
|
{
|
||||||
pthread_proxy_data *ptr = arg;
|
struct pthread_proxy_data *ptr = arg;
|
||||||
void (*proc)(JThread thread, void *data) = ptr->proc;
|
void (*proc)(void *data) = ptr->proc;
|
||||||
void *data = ptr->data;
|
void *data = ptr->data;
|
||||||
jfree(ptr);
|
jfree(ptr);
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user