summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGustavo Sverzut Barbieri <barbieri@gmail.com>2012-12-28 18:42:35 +0000
committerGustavo Sverzut Barbieri <barbieri@gmail.com>2012-12-28 18:42:35 +0000
commit6104a51efe9e2bf906567bb8e17fbb9c43d8e927 (patch)
tree3fab1e8c181d6b94ca2663f7cae93b4bc8173406 /src
parent1244d055e4fec78e9e92f52456bdc523f87fadb4 (diff)
efl/docs: fix evil x escape conflicts
SVN revision: 81827
Diffstat (limited to 'src')
-rw-r--r--src/lib/evil/Evil.h16
-rw-r--r--src/lib/evil/dlfcn.h12
-rw-r--r--src/lib/evil/sys/mman.h6
3 files changed, 14 insertions, 20 deletions
diff --git a/src/lib/evil/Evil.h b/src/lib/evil/Evil.h
index f69fa6d1bc..191aae9c12 100644
--- a/src/lib/evil/Evil.h
+++ b/src/lib/evil/Evil.h
@@ -2,8 +2,12 @@
2#define __EVIL_H__ 2#define __EVIL_H__
3 3
4/** 4/**
5 * @file Evil.h
6 * @brief The file that provides miscellaneous functions ported from Unix.
7 */
8
9/**
5 * @page evil_main Evil 10 * @page evil_main Evil
6 * @image html e_big.png
7 * @author Vincent Torri 11 * @author Vincent Torri
8 * @version 1.7.0 12 * @version 1.7.0
9 * @date 2008-2012 13 * @date 2008-2012
@@ -44,16 +48,6 @@
44 */ 48 */
45 49
46/** 50/**
47 * @file Evil.h
48 * @brief The file that provides miscellaneous functions ported from Unix.
49 * @defgroup Evil Miscellaneous functions ported from Unix.
50 *
51 * This header provides miscellaneous functions that exist on Unix
52 * but not on Windows platform. They try to follow the conformance of
53 * the Unix versions.
54 */
55
56/**
57 * @cond LOCAL 51 * @cond LOCAL
58 */ 52 */
59 53
diff --git a/src/lib/evil/dlfcn.h b/src/lib/evil/dlfcn.h
index ba6c26298a..a054fe907c 100644
--- a/src/lib/evil/dlfcn.h
+++ b/src/lib/evil/dlfcn.h
@@ -36,7 +36,7 @@ extern "C" {
36/** 36/**
37 * @file dlfcn.h 37 * @file dlfcn.h
38 * @brief The file that provides functions to manage dynamic-link libraries 38 * @brief The file that provides functions to manage dynamic-link libraries
39 * @defgroup Dlfcn Functions that manage dynamic-link libraries. 39 * @defgroup Evil_Dlfcn Functions that manage dynamic-link libraries.
40 * @ingroup Evil 40 * @ingroup Evil
41 * 41 *
42 * This header provides functions to load and unload dynamic-link 42 * This header provides functions to load and unload dynamic-link
@@ -151,7 +151,7 @@ struct Dl_info
151 * Supported OS: Windows Vista, Windows XP or Windows 2000 151 * Supported OS: Windows Vista, Windows XP or Windows 2000
152 * Professional. 152 * Professional.
153 * 153 *
154 * @ingroup Dlfcn 154 * @ingroup Evil_Dlfcn
155 */ 155 */
156EAPI void *dlopen(const char* path, int mode); 156EAPI void *dlopen(const char* path, int mode);
157 157
@@ -175,7 +175,7 @@ EAPI void *dlopen(const char* path, int mode);
175 * Supported OS: Windows Vista, Windows XP or Windows 2000 175 * Supported OS: Windows Vista, Windows XP or Windows 2000
176 * Professional. 176 * Professional.
177 * 177 *
178 * @ingroup Dlfcn 178 * @ingroup Evil_Dlfcn
179 */ 179 */
180EAPI int dlclose(void* handle); 180EAPI int dlclose(void* handle);
181 181
@@ -199,7 +199,7 @@ EAPI int dlclose(void* handle);
199 * Supported OS: Windows Vista, Windows XP or Windows 2000 199 * Supported OS: Windows Vista, Windows XP or Windows 2000
200 * Professional. 200 * Professional.
201 * 201 *
202 * @ingroup Dlfcn 202 * @ingroup Evil_Dlfcn
203 */ 203 */
204EAPI void *dlsym(void* handle, const char* symbol); 204EAPI void *dlsym(void* handle, const char* symbol);
205 205
@@ -223,7 +223,7 @@ EAPI void *dlsym(void* handle, const char* symbol);
223 * Supported OS: Windows Vista, Windows XP or Windows 2000 223 * Supported OS: Windows Vista, Windows XP or Windows 2000
224 * Professional. 224 * Professional.
225 * 225 *
226 * @ingroup Dlfcn 226 * @ingroup Evil_Dlfcn
227 */ 227 */
228EAPI int dladdr (const void *addr, Dl_info *info); 228EAPI int dladdr (const void *addr, Dl_info *info);
229 229
@@ -246,7 +246,7 @@ EAPI int dladdr (const void *addr, Dl_info *info);
246 * Supported OS: Windows Vista, Windows XP or Windows 2000 246 * Supported OS: Windows Vista, Windows XP or Windows 2000
247 * Professional. 247 * Professional.
248 * 248 *
249 * @ingroup Dlfcn 249 * @ingroup Evil_Dlfcn
250 */ 250 */
251EAPI char *dlerror (void); 251EAPI char *dlerror (void);
252 252
diff --git a/src/lib/evil/sys/mman.h b/src/lib/evil/sys/mman.h
index 0cff227c08..c49fbf6756 100644
--- a/src/lib/evil/sys/mman.h
+++ b/src/lib/evil/sys/mman.h
@@ -64,7 +64,7 @@ extern "C" {
64/** 64/**
65 * @file mman.h 65 * @file mman.h
66 * @brief The file that provides the memory map functions 66 * @brief The file that provides the memory map functions
67 * @defgroup Mman Functions that manage memory mappping. 67 * @defgroup Evil_Mman Functions that manage memory mappping.
68 * @ingroup Evil 68 * @ingroup Evil
69 * 69 *
70 * This header provides the meomry map functions mmap and munmap. 70 * This header provides the meomry map functions mmap and munmap.
@@ -108,7 +108,7 @@ extern "C" {
108 * Supported OS: Windows Vista, Windows XP or Windows 2000 108 * Supported OS: Windows Vista, Windows XP or Windows 2000
109 * Professional. 109 * Professional.
110 * 110 *
111 * @ingroup Mman 111 * @ingroup Evil_Mman
112 */ 112 */
113EAPI void *mmap(void *addr, 113EAPI void *mmap(void *addr,
114 size_t len, 114 size_t len,
@@ -135,7 +135,7 @@ EAPI void *mmap(void *addr,
135 * Supported OS: Windows Vista, Windows XP or Windows 2000 135 * Supported OS: Windows Vista, Windows XP or Windows 2000
136 * Professional. 136 * Professional.
137 * 137 *
138 * @ingroup Mman 138 * @ingroup Evil_Mman
139 */ 139 */
140EAPI int munmap(void *addr, 140EAPI int munmap(void *addr,
141 size_t len); 141 size_t len);