summaryrefslogtreecommitdiff
path: root/src/lib/escape
diff options
context:
space:
mode:
authorGustavo Sverzut Barbieri <barbieri@gmail.com>2012-12-28 18:42:57 +0000
committerGustavo Sverzut Barbieri <barbieri@gmail.com>2012-12-28 18:42:57 +0000
commit9b94a00e1fbb2727b847db99d92c6ccedd091c66 (patch)
treeecf89b4fc918603968104fd526828184b5f4cd76 /src/lib/escape
parent6104a51efe9e2bf906567bb8e17fbb9c43d8e927 (diff)
efl/docs: fix Evil x Escape conflicts
SVN revision: 81828
Diffstat (limited to 'src/lib/escape')
-rw-r--r--src/lib/escape/Escape.h2
-rw-r--r--src/lib/escape/escape_libgen.h1
-rw-r--r--src/lib/escape/escape_unistd.h1
-rw-r--r--src/lib/escape/sys/mman.h9
4 files changed, 7 insertions, 6 deletions
diff --git a/src/lib/escape/Escape.h b/src/lib/escape/Escape.h
index c362566d16..c8f6267ec3 100644
--- a/src/lib/escape/Escape.h
+++ b/src/lib/escape/Escape.h
@@ -20,8 +20,6 @@
20 20
21/** 21/**
22 * @page escape_main Escape 22 * @page escape_main Escape
23 * @image html e_big.png
24 * @author Youness Alaoui
25 * @date 2011 23 * @date 2011
26 * 24 *
27 * @section intro_sec Introduction 25 * @section intro_sec Introduction
diff --git a/src/lib/escape/escape_libgen.h b/src/lib/escape/escape_libgen.h
index 0c23a76821..4b636740f7 100644
--- a/src/lib/escape/escape_libgen.h
+++ b/src/lib/escape/escape_libgen.h
@@ -5,6 +5,7 @@
5 * @file escape_libgen.h 5 * @file escape_libgen.h
6 * @brief The file that provides functions ported from Unix in libgen.h. 6 * @brief The file that provides functions ported from Unix in libgen.h.
7 * @defgroup Escape_Libgen_Group Libgen.h functions. 7 * @defgroup Escape_Libgen_Group Libgen.h functions.
8 * @ingroup Escape
8 * 9 *
9 * This header provides functions ported from Unix in libgen.h. 10 * This header provides functions ported from Unix in libgen.h.
10 * 11 *
diff --git a/src/lib/escape/escape_unistd.h b/src/lib/escape/escape_unistd.h
index 0e96d3f3cb..1ed1b5abce 100644
--- a/src/lib/escape/escape_unistd.h
+++ b/src/lib/escape/escape_unistd.h
@@ -5,6 +5,7 @@
5 * @file escape_unistd.h 5 * @file escape_unistd.h
6 * @brief The file that provides functions ported from Unix in unistd.h. 6 * @brief The file that provides functions ported from Unix in unistd.h.
7 * @defgroup Escape_Unistd_Group Unistd.h functions 7 * @defgroup Escape_Unistd_Group Unistd.h functions
8 * @ingroup Escape
8 * 9 *
9 * This header provides functions ported from Unix in unistd.h. 10 * This header provides functions ported from Unix in unistd.h.
10 * 11 *
diff --git a/src/lib/escape/sys/mman.h b/src/lib/escape/sys/mman.h
index 98ef7fa5fc..b243c15362 100644
--- a/src/lib/escape/sys/mman.h
+++ b/src/lib/escape/sys/mman.h
@@ -61,7 +61,8 @@ extern "C" {
61/** 61/**
62 * @file mman.h 62 * @file mman.h
63 * @brief The file that provides the memory map functions 63 * @brief The file that provides the memory map functions
64 * @defgroup Mman Functions that manage memory mappping. 64 * @defgroup Escape_Mman Functions that manage memory mappping.
65 * @ingroup Escape
65 * 66 *
66 * This header provides the meomry map functions mmap and munmap. 67 * This header provides the meomry map functions mmap and munmap.
67 * 68 *
@@ -101,7 +102,7 @@ extern "C" {
101 * 102 *
102 * Conformity: None. 103 * Conformity: None.
103 * 104 *
104 * @ingroup Mman 105 * @ingroup Escape_Mman
105 */ 106 */
106EAPI void *mmap(void *addr, 107EAPI void *mmap(void *addr,
107 size_t len, 108 size_t len,
@@ -125,7 +126,7 @@ EAPI void *mmap(void *addr,
125 * 126 *
126 * Conformity: None. 127 * Conformity: None.
127 * 128 *
128 * @ingroup Mman 129 * @ingroup Escape_Mman
129 */ 130 */
130EAPI int 131EAPI int
131munmap(void *addr, 132munmap(void *addr,
@@ -164,7 +165,7 @@ munmap(void *addr,
164 165
165 * Conformity: None. 166 * Conformity: None.
166 * 167 *
167 * @ingroup Mman 168 * @ingroup Escape_Mman
168 */ 169 */
169EAPI int 170EAPI int
170madvise(void *addr, 171madvise(void *addr,