forked from enlightenment/efl
Evil: remove wrapper around getcwd()
Summary: getcwd() is declared in direct.h Test Plan: compilation Reviewers: raster, cedric, zmike Reviewed By: zmike Subscribers: #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D8858
This commit is contained in:
parent
a4c44e5e74
commit
b141c42e3f
|
@ -17,6 +17,10 @@
|
||||||
# include <alloca.h>
|
# include <alloca.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef _WIN32
|
||||||
|
# include <direct.h> /* getcwd */
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef HAVE_ENVIRON
|
#ifdef HAVE_ENVIRON
|
||||||
extern char **environ;
|
extern char **environ;
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -6,6 +6,7 @@
|
||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
|
# include <direct.h> /* getcwd */
|
||||||
# include <winsock2.h>
|
# include <winsock2.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -42,6 +42,7 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
|
# include <direct.h> /* getcwd */
|
||||||
# include <Evil.h>
|
# include <Evil.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -11,6 +11,7 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
|
# include <direct.h> /* getcwd */
|
||||||
# include <Evil.h>
|
# include <Evil.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -49,16 +49,6 @@
|
||||||
* evil_unistd.h
|
* evil_unistd.h
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
|
||||||
* @def getcwd(b,s)
|
|
||||||
*
|
|
||||||
* Wrapper around evil_getcwd().
|
|
||||||
*/
|
|
||||||
#ifdef getcwd
|
|
||||||
# undef getcwd
|
|
||||||
#endif
|
|
||||||
#define getcwd(b,s) evil_getcwd((b),(s))
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @def pipe(fds)
|
* @def pipe(fds)
|
||||||
*
|
*
|
||||||
|
|
|
@ -62,17 +62,6 @@ evil_time_get(void)
|
||||||
return (double)_evil_time_second + (double)(count.QuadPart - _evil_time_count)/ (double)_evil_time_freq;
|
return (double)_evil_time_second + (double)(count.QuadPart - _evil_time_count)/ (double)_evil_time_freq;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
* File related functions
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
char *
|
|
||||||
evil_getcwd(char *buffer, size_t size)
|
|
||||||
{
|
|
||||||
return _getcwd(buffer, (int)size);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Sockets and pipe related functions
|
* Sockets and pipe related functions
|
||||||
|
|
|
@ -36,27 +36,6 @@
|
||||||
*/
|
*/
|
||||||
EAPI double evil_time_get(void);
|
EAPI double evil_time_get(void);
|
||||||
|
|
||||||
|
|
||||||
/*
|
|
||||||
* file related functions
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @brief Get the current directory.
|
|
||||||
*
|
|
||||||
* @param buffer Buffer to store the current directory.
|
|
||||||
* @param size Size of the buffer.
|
|
||||||
* @return The current directory.
|
|
||||||
*
|
|
||||||
* Use the _getcwd function in MSVCRT.
|
|
||||||
*
|
|
||||||
* Conformity: Almost POSIX.1 (no errno set)
|
|
||||||
*
|
|
||||||
* Supported OS: Windows XP.
|
|
||||||
*/
|
|
||||||
EAPI char *evil_getcwd(char *buffer, size_t size);
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Sockets and pipe related functions
|
* Sockets and pipe related functions
|
||||||
*
|
*
|
||||||
|
|
|
@ -5,6 +5,10 @@
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
|
|
||||||
|
#ifdef _WIN32
|
||||||
|
# include <direct.h> /* getcwd */
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <Eina.h>
|
#include <Eina.h>
|
||||||
#include <Evas.h>
|
#include <Evas.h>
|
||||||
#include <Ecore.h>
|
#include <Ecore.h>
|
||||||
|
|
|
@ -8,6 +8,10 @@
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <limits.h>
|
#include <limits.h>
|
||||||
|
|
||||||
|
#ifdef _WIN32
|
||||||
|
# include <direct.h> /* getcwd */
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <Efreet.h>
|
#include <Efreet.h>
|
||||||
|
|
||||||
#include "ef_test.h"
|
#include "ef_test.h"
|
||||||
|
|
Loading…
Reference in New Issue