forked from enlightenment/efl
include evil_private.h in last files, and disable symbolic links on Windows in a couple of files
Test Plan: compilation Reviewers: zmike, raster, cedric Reviewed By: zmike Subscribers: #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D8933
This commit is contained in:
parent
af70c4ff6d
commit
8db978aa4c
|
@ -487,12 +487,14 @@ icon_changes_monitor_add(const struct stat *st, const char *path)
|
||||||
const char *monpath = path;
|
const char *monpath = path;
|
||||||
|
|
||||||
if (eina_hash_find(icon_change_monitors, path)) return;
|
if (eina_hash_find(icon_change_monitors, path)) return;
|
||||||
|
#ifndef _WIN32
|
||||||
if (S_ISLNK(st->st_mode))
|
if (S_ISLNK(st->st_mode))
|
||||||
{
|
{
|
||||||
realp = ecore_file_realpath(path);
|
realp = ecore_file_realpath(path);
|
||||||
if (!realp) return;
|
if (!realp) return;
|
||||||
monpath = realp;
|
monpath = realp;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
if (ecore_file_is_dir(monpath))
|
if (ecore_file_is_dir(monpath))
|
||||||
{
|
{
|
||||||
mon = eio_monitor_add(monpath);
|
mon = eio_monitor_add(monpath);
|
||||||
|
@ -513,12 +515,14 @@ desktop_changes_monitor_add(const struct stat *st, const char *path)
|
||||||
const char *monpath = path;
|
const char *monpath = path;
|
||||||
|
|
||||||
if (eina_hash_find(desktop_change_monitors, path)) return;
|
if (eina_hash_find(desktop_change_monitors, path)) return;
|
||||||
|
#ifndef _WIN32
|
||||||
if (S_ISLNK(st->st_mode))
|
if (S_ISLNK(st->st_mode))
|
||||||
{
|
{
|
||||||
realp = ecore_file_realpath(path);
|
realp = ecore_file_realpath(path);
|
||||||
if (!realp) return;
|
if (!realp) return;
|
||||||
monpath = realp;
|
monpath = realp;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
if (ecore_file_is_dir(monpath))
|
if (ecore_file_is_dir(monpath))
|
||||||
{
|
{
|
||||||
mon = eio_monitor_add(monpath);
|
mon = eio_monitor_add(monpath);
|
||||||
|
|
|
@ -9,6 +9,8 @@
|
||||||
# include <config.h>
|
# include <config.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#include <evil_private.h> /* evil_format_message evil_last_error_get */
|
||||||
|
|
||||||
#include "Ecore.h"
|
#include "Ecore.h"
|
||||||
#include "Ecore_Con.h"
|
#include "Ecore_Con.h"
|
||||||
#include "ecore_con_private.h"
|
#include "ecore_con_private.h"
|
||||||
|
|
|
@ -6,6 +6,8 @@
|
||||||
# include <config.h>
|
# include <config.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#include <evil_private.h> /* evil_format_message evil_last_error_get */
|
||||||
|
|
||||||
#include "Ecore.h"
|
#include "Ecore.h"
|
||||||
#include "Ecore_Con.h"
|
#include "Ecore_Con.h"
|
||||||
#include "ecore_con_private.h"
|
#include "ecore_con_private.h"
|
||||||
|
|
|
@ -224,7 +224,8 @@ _ecore_evas_available_engines_get(void)
|
||||||
const char *name;
|
const char *name;
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
EVIL_PATH_SEP_WIN32_TO_UNIX(info->path);
|
name = strrchr(info->path, '\\');
|
||||||
|
if (name) name++;
|
||||||
#endif
|
#endif
|
||||||
name = strrchr(info->path, '/');
|
name = strrchr(info->path, '/');
|
||||||
if (name) name++;
|
if (name) name++;
|
||||||
|
|
|
@ -274,8 +274,10 @@ _efl_io_model_info_type_get(const Eina_File_Direct_Info *info, const Eina_Stat *
|
||||||
return EINA_FILE_BLK;
|
return EINA_FILE_BLK;
|
||||||
else if (S_ISFIFO(st->mode))
|
else if (S_ISFIFO(st->mode))
|
||||||
return EINA_FILE_FIFO;
|
return EINA_FILE_FIFO;
|
||||||
|
#ifndef _WIN32
|
||||||
else if (S_ISLNK(st->mode))
|
else if (S_ISLNK(st->mode))
|
||||||
return EINA_FILE_LNK;
|
return EINA_FILE_LNK;
|
||||||
|
#endif
|
||||||
#ifdef S_ISSOCK
|
#ifdef S_ISSOCK
|
||||||
else if (S_ISSOCK(st->mode))
|
else if (S_ISSOCK(st->mode))
|
||||||
return EINA_FILE_SOCK;
|
return EINA_FILE_SOCK;
|
||||||
|
|
|
@ -95,8 +95,10 @@ _eio_file_recursiv_ls(Ecore_Thread *thread,
|
||||||
if (_eio_lstat(info->path, &buffer) != 0)
|
if (_eio_lstat(info->path, &buffer) != 0)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
|
#ifndef _WIN32
|
||||||
if (S_ISLNK(buffer.st_mode))
|
if (S_ISLNK(buffer.st_mode))
|
||||||
info->type = EINA_FILE_LNK;
|
info->type = EINA_FILE_LNK;
|
||||||
|
#endif
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,9 @@
|
||||||
#include "elua_private.h"
|
#include "elua_private.h"
|
||||||
|
|
||||||
|
#ifdef _WIN32
|
||||||
|
# include <evil_private.h> /* realpath */
|
||||||
|
#endif
|
||||||
|
|
||||||
/* expand fname to full path name (so that PATH is ignored) plus turn
|
/* expand fname to full path name (so that PATH is ignored) plus turn
|
||||||
* stuff into a command, and also verify whether the path exists */
|
* stuff into a command, and also verify whether the path exists */
|
||||||
static char *
|
static char *
|
||||||
|
|
|
@ -2,6 +2,11 @@
|
||||||
# include "config.h"
|
# include "config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef _WIN32
|
||||||
|
/* normally, they will never be called as it's for Wayland */
|
||||||
|
# include <evil_private.h> /* setenv unsetenv */
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "emotion_private.h"
|
#include "emotion_private.h"
|
||||||
#include "../../static_libs/buildsystem/buildsystem.h"
|
#include "../../static_libs/buildsystem/buildsystem.h"
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
|
Loading…
Reference in New Issue