summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2019-05-08 08:39:36 -0400
committerMike Blumenkrantz <zmike@samsung.com>2019-05-08 08:39:36 -0400
commitb141c42e3f932c4b935df2a13ef55d4e7f66a726 (patch)
tree9d1e1d0b0e7917e9c6b6d6499c2792468694d3fa /src/lib
parenta4c44e5e744dba15dfe512668127906afd4b6dba (diff)
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
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/efreet/efreet_desktop_command.c1
-rw-r--r--src/lib/eina/eina_prefix.c1
-rw-r--r--src/lib/elementary/elm_main.c1
-rw-r--r--src/lib/evil/evil_macro_wrapper.h10
-rw-r--r--src/lib/evil/evil_unistd.c11
-rw-r--r--src/lib/evil/evil_unistd.h21
6 files changed, 3 insertions, 42 deletions
diff --git a/src/lib/efreet/efreet_desktop_command.c b/src/lib/efreet/efreet_desktop_command.c
index 8c99102c3d..26ac9aca2f 100644
--- a/src/lib/efreet/efreet_desktop_command.c
+++ b/src/lib/efreet/efreet_desktop_command.c
@@ -6,6 +6,7 @@
6#include <ctype.h> 6#include <ctype.h>
7 7
8#ifdef _WIN32 8#ifdef _WIN32
9# include <direct.h> /* getcwd */
9# include <winsock2.h> 10# include <winsock2.h>
10#endif 11#endif
11 12
diff --git a/src/lib/eina/eina_prefix.c b/src/lib/eina/eina_prefix.c
index 51ec9b3136..aeac22f4b7 100644
--- a/src/lib/eina/eina_prefix.c
+++ b/src/lib/eina/eina_prefix.c
@@ -42,6 +42,7 @@
42#endif 42#endif
43 43
44#ifdef _WIN32 44#ifdef _WIN32
45# include <direct.h> /* getcwd */
45# include <Evil.h> 46# include <Evil.h>
46#endif 47#endif
47 48
diff --git a/src/lib/elementary/elm_main.c b/src/lib/elementary/elm_main.c
index f3438364e3..4bb77acf45 100644
--- a/src/lib/elementary/elm_main.c
+++ b/src/lib/elementary/elm_main.c
@@ -11,6 +11,7 @@
11#endif 11#endif
12 12
13#ifdef _WIN32 13#ifdef _WIN32
14# include <direct.h> /* getcwd */
14# include <Evil.h> 15# include <Evil.h>
15#endif 16#endif
16 17
diff --git a/src/lib/evil/evil_macro_wrapper.h b/src/lib/evil/evil_macro_wrapper.h
index 9eb1ac7a6e..cd650e5e12 100644
--- a/src/lib/evil/evil_macro_wrapper.h
+++ b/src/lib/evil/evil_macro_wrapper.h
@@ -50,16 +50,6 @@
50 */ 50 */
51 51
52/** 52/**
53 * @def getcwd(b,s)
54 *
55 * Wrapper around evil_getcwd().
56 */
57#ifdef getcwd
58# undef getcwd
59#endif
60#define getcwd(b,s) evil_getcwd((b),(s))
61
62/**
63 * @def pipe(fds) 53 * @def pipe(fds)
64 * 54 *
65 * Wrapper around evil_pipe(). 55 * Wrapper around evil_pipe().
diff --git a/src/lib/evil/evil_unistd.c b/src/lib/evil/evil_unistd.c
index 27f682581b..765c7aa34f 100644
--- a/src/lib/evil/evil_unistd.c
+++ b/src/lib/evil/evil_unistd.c
@@ -62,17 +62,6 @@ evil_time_get(void)
62 return (double)_evil_time_second + (double)(count.QuadPart - _evil_time_count)/ (double)_evil_time_freq; 62 return (double)_evil_time_second + (double)(count.QuadPart - _evil_time_count)/ (double)_evil_time_freq;
63} 63}
64 64
65/*
66 * File related functions
67 *
68 */
69
70char *
71evil_getcwd(char *buffer, size_t size)
72{
73 return _getcwd(buffer, (int)size);
74}
75
76 65
77/* 66/*
78 * Sockets and pipe related functions 67 * Sockets and pipe related functions
diff --git a/src/lib/evil/evil_unistd.h b/src/lib/evil/evil_unistd.h
index 5319c474f3..a227e14fc2 100644
--- a/src/lib/evil/evil_unistd.h
+++ b/src/lib/evil/evil_unistd.h
@@ -36,27 +36,6 @@
36 */ 36 */
37EAPI double evil_time_get(void); 37EAPI double evil_time_get(void);
38 38
39
40/*
41 * file related functions
42 *
43 */
44
45/**
46 * @brief Get the current directory.
47 *
48 * @param buffer Buffer to store the current directory.
49 * @param size Size of the buffer.
50 * @return The current directory.
51 *
52 * Use the _getcwd function in MSVCRT.
53 *
54 * Conformity: Almost POSIX.1 (no errno set)
55 *
56 * Supported OS: Windows XP.
57 */
58EAPI char *evil_getcwd(char *buffer, size_t size);
59
60/* 39/*
61 * Sockets and pipe related functions 40 * Sockets and pipe related functions
62 * 41 *