summaryrefslogtreecommitdiff
path: root/src/lib/evil
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2012-10-05 20:09:47 +0000
committerVincent Torri <vincent.torri@gmail.com>2012-10-05 20:09:47 +0000
commit7fe3d3599446108bc36a0ab6ec563a267db02733 (patch)
tree8c45e7b3087e289466d4fb4ff99b12b209b770f6 /src/lib/evil
parent227ef6982edc5e7a31f74077b93e82aeb33d7d6f (diff)
merge: __UNUSED__ --> EINA_UNUSED and some fixes in eo.
SVN revision: 77542
Diffstat (limited to 'src/lib/evil')
-rw-r--r--src/lib/evil/dlfcn.c5
-rw-r--r--src/lib/evil/evil_mman.c5
-rw-r--r--src/lib/evil/evil_private.h8
-rw-r--r--src/lib/evil/evil_stdio.c2
-rw-r--r--src/lib/evil/evil_string.c3
-rw-r--r--src/lib/evil/evil_unistd.c4
6 files changed, 19 insertions, 8 deletions
diff --git a/src/lib/evil/dlfcn.c b/src/lib/evil/dlfcn.c
index 818cabf014..a877653ec6 100644
--- a/src/lib/evil/dlfcn.c
+++ b/src/lib/evil/dlfcn.c
@@ -21,6 +21,7 @@
21#endif 21#endif
22 22
23#include "Evil.h" 23#include "Evil.h"
24#include "evil_private.h"
24 25
25#include "dlfcn.h" 26#include "dlfcn.h"
26 27
@@ -57,7 +58,7 @@ get_last_error(char *desc)
57} 58}
58 59
59void * 60void *
60dlopen(const char* path, int mode __UNUSED__) 61dlopen(const char* path, int mode EVIL_UNUSED)
61{ 62{
62 HMODULE module = NULL; 63 HMODULE module = NULL;
63 64
@@ -190,7 +191,7 @@ dlsym(void *handle, const char *symbol)
190} 191}
191 192
192int 193int
193dladdr (const void *addr __UNUSED__, Dl_info *info) 194dladdr (const void *addr EVIL_UNUSED, Dl_info *info)
194{ 195{
195 TCHAR tpath[PATH_MAX]; 196 TCHAR tpath[PATH_MAX];
196 MEMORY_BASIC_INFORMATION mbi; 197 MEMORY_BASIC_INFORMATION mbi;
diff --git a/src/lib/evil/evil_mman.c b/src/lib/evil/evil_mman.c
index 8898357cfc..709eb24fc8 100644
--- a/src/lib/evil/evil_mman.c
+++ b/src/lib/evil/evil_mman.c
@@ -24,6 +24,7 @@
24#include "evil_private.h" 24#include "evil_private.h"
25#define APICHAR char 25#define APICHAR char
26#include "evil_print.h" 26#include "evil_print.h"
27#include "evil_private.h"
27 28
28#ifdef __MINGW32CE__ 29#ifdef __MINGW32CE__
29# define _get_osfhandle(FILEDES) ((long)FILEDES) 30# define _get_osfhandle(FILEDES) ((long)FILEDES)
@@ -34,7 +35,7 @@
34 35
35 36
36void * 37void *
37mmap(void *addr __UNUSED__, 38mmap(void *addr EVIL_UNUSED,
38 size_t len, 39 size_t len,
39 int prot, 40 int prot,
40 int flags, 41 int flags,
@@ -189,7 +190,7 @@ mmap(void *addr __UNUSED__,
189 190
190int 191int
191munmap(void *addr, 192munmap(void *addr,
192 size_t len __UNUSED__) 193 size_t len EVIL_UNUSED)
193{ 194{
194#ifdef _WIN32_WCE 195#ifdef _WIN32_WCE
195 OSVERSIONINFO os_version; 196 OSVERSIONINFO os_version;
diff --git a/src/lib/evil/evil_private.h b/src/lib/evil/evil_private.h
index d46a379d01..0f8b6d193e 100644
--- a/src/lib/evil/evil_private.h
+++ b/src/lib/evil/evil_private.h
@@ -6,6 +6,14 @@
6extern "C" { 6extern "C" {
7#endif 7#endif
8 8
9#ifdef __GNUC__
10# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)
11# define EVIL_UNUSED __attribute__ ((__unused__))
12# else
13# define EVIL_UNUSED
14# endif
15#endif
16
9long _evil_systemtime_to_time(SYSTEMTIME st); 17long _evil_systemtime_to_time(SYSTEMTIME st);
10 18
11void _evil_error_display(const char *fct, LONG res); 19void _evil_error_display(const char *fct, LONG res);
diff --git a/src/lib/evil/evil_stdio.c b/src/lib/evil/evil_stdio.c
index 594d281159..1aa6f67537 100644
--- a/src/lib/evil/evil_stdio.c
+++ b/src/lib/evil/evil_stdio.c
@@ -15,7 +15,7 @@
15 * 15 *
16 */ 16 */
17 17
18void evil_perror (const char *s __UNUSED__) 18void evil_perror (const char *s EVIL_UNUSED)
19{ 19{
20 fprintf(stderr, "[Windows CE] error\n"); 20 fprintf(stderr, "[Windows CE] error\n");
21} 21}
diff --git a/src/lib/evil/evil_string.c b/src/lib/evil/evil_string.c
index ffbe308b67..491a880e1a 100644
--- a/src/lib/evil/evil_string.c
+++ b/src/lib/evil/evil_string.c
@@ -3,6 +3,7 @@
3#endif /* HAVE_CONFIG_H */ 3#endif /* HAVE_CONFIG_H */
4 4
5#include "Evil.h" 5#include "Evil.h"
6#include "evil_private.h"
6 7
7 8
8#ifdef _WIN32_WCE 9#ifdef _WIN32_WCE
@@ -12,7 +13,7 @@
12 * 13 *
13 */ 14 */
14 15
15char *strerror (int errnum __UNUSED__) 16char *strerror (int errnum EVIL_UNUSED)
16{ 17{
17 return "[Windows CE] error\n"; 18 return "[Windows CE] error\n";
18} 19}
diff --git a/src/lib/evil/evil_unistd.c b/src/lib/evil/evil_unistd.c
index e1498509df..10ef018e1e 100644
--- a/src/lib/evil/evil_unistd.c
+++ b/src/lib/evil/evil_unistd.c
@@ -68,7 +68,7 @@ evil_time_get(void)
68 68
69#ifdef _MSC_VER 69#ifdef _MSC_VER
70int 70int
71evil_gettimeofday(struct timeval *tp, void *tzp __UNUSED__) 71evil_gettimeofday(struct timeval *tp, void *tzp EVIL_UNUSED)
72{ 72{
73 LARGE_INTEGER count; 73 LARGE_INTEGER count;
74 LONGLONG diff; 74 LONGLONG diff;
@@ -423,7 +423,7 @@ evil_pipe(int *fds)
423 423
424#ifdef _WIN32_WCE 424#ifdef _WIN32_WCE
425 425
426int execvp (const char *file __UNUSED__, char *const argv[] __UNUSED__) 426int execvp (const char *file EVIL_UNUSED, char *const argv[] EVIL_UNUSED)
427{ 427{
428 return 1; 428 return 1;
429} 429}