Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame^] | 1 | commit ca780b4f7f71abeeb04a585f2a4d889caaa985fa |
| 2 | Author: Isaac Dunham <ibid.ag@gmail.com> |
| 3 | Date: Fri Sep 5 22:35:32 2014 -0700 |
| 4 | |
| 5 | Remove __.*DECLS nonsense |
| 6 | |
| 7 | Upstream-Status: Pending |
| 8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 9 | |
| 10 | Index: libcgroup-0.41/include/libcgroup/config.h |
| 11 | =================================================================== |
| 12 | --- libcgroup-0.41.orig/include/libcgroup/config.h |
| 13 | +++ libcgroup-0.41/include/libcgroup/config.h |
| 14 | @@ -9,7 +9,9 @@ |
| 15 | #include <features.h> |
| 16 | #endif |
| 17 | |
| 18 | -__BEGIN_DECLS |
| 19 | +#ifdef __cplusplus |
| 20 | +extern "C" { |
| 21 | +#endif |
| 22 | |
| 23 | /** |
| 24 | * @defgroup group_config 5. Configuration |
| 25 | @@ -107,6 +109,8 @@ int cgroup_config_create_template_group( |
| 26 | * @} |
| 27 | * @} |
| 28 | */ |
| 29 | -__END_DECLS |
| 30 | +#ifdef __cplusplus |
| 31 | +} |
| 32 | +#endif |
| 33 | |
| 34 | #endif /*_LIBCGROUP_CONFIG_H*/ |
| 35 | Index: libcgroup-0.41/include/libcgroup/error.h |
| 36 | =================================================================== |
| 37 | --- libcgroup-0.41.orig/include/libcgroup/error.h |
| 38 | +++ libcgroup-0.41/include/libcgroup/error.h |
| 39 | @@ -9,7 +9,9 @@ |
| 40 | #include <features.h> |
| 41 | #endif |
| 42 | |
| 43 | -__BEGIN_DECLS |
| 44 | +#ifdef __cplusplus |
| 45 | +extern "C" { |
| 46 | +#endif |
| 47 | |
| 48 | /** |
| 49 | * @defgroup group_errors 6. Error handling |
| 50 | @@ -99,6 +101,8 @@ int cgroup_get_last_errno(void); |
| 51 | * @} |
| 52 | * @} |
| 53 | */ |
| 54 | -__END_DECLS |
| 55 | +#ifdef __cplusplus |
| 56 | +} |
| 57 | +#endif |
| 58 | |
| 59 | #endif /* _LIBCGROUP_INIT_H */ |
| 60 | Index: libcgroup-0.41/include/libcgroup/groups.h |
| 61 | =================================================================== |
| 62 | --- libcgroup-0.41.orig/include/libcgroup/groups.h |
| 63 | +++ libcgroup-0.41/include/libcgroup/groups.h |
| 64 | @@ -11,7 +11,9 @@ |
| 65 | #include <stdbool.h> |
| 66 | #endif |
| 67 | |
| 68 | -__BEGIN_DECLS |
| 69 | +#ifdef __cplusplus |
| 70 | +extern "C" { |
| 71 | +#endif |
| 72 | |
| 73 | /** |
| 74 | * Flags for cgroup_delete_cgroup_ext(). |
| 75 | @@ -577,6 +579,8 @@ char *cgroup_get_cgroup_name(struct cgro |
| 76 | */ |
| 77 | |
| 78 | |
| 79 | -__END_DECLS |
| 80 | +#ifdef __cplusplus |
| 81 | +} |
| 82 | +#endif |
| 83 | |
| 84 | #endif /* _LIBCGROUP_GROUPS_H */ |
| 85 | Index: libcgroup-0.41/include/libcgroup/init.h |
| 86 | =================================================================== |
| 87 | --- libcgroup-0.41.orig/include/libcgroup/init.h |
| 88 | +++ libcgroup-0.41/include/libcgroup/init.h |
| 89 | @@ -9,7 +9,9 @@ |
| 90 | #include <features.h> |
| 91 | #endif |
| 92 | |
| 93 | -__BEGIN_DECLS |
| 94 | +#ifdef __cplusplus |
| 95 | +extern "C" { |
| 96 | +#endif |
| 97 | |
| 98 | /** |
| 99 | * @defgroup group_init 1. Initialization |
| 100 | @@ -58,6 +60,8 @@ int cgroup_get_subsys_mount_point(const |
| 101 | * @} |
| 102 | * @} |
| 103 | */ |
| 104 | -__END_DECLS |
| 105 | +#ifdef __cplusplus |
| 106 | +} |
| 107 | +#endif |
| 108 | |
| 109 | #endif /* _LIBCGROUP_INIT_H */ |
| 110 | Index: libcgroup-0.41/include/libcgroup/iterators.h |
| 111 | =================================================================== |
| 112 | --- libcgroup-0.41.orig/include/libcgroup/iterators.h |
| 113 | +++ libcgroup-0.41/include/libcgroup/iterators.h |
| 114 | @@ -11,7 +11,9 @@ |
| 115 | #include <features.h> |
| 116 | #endif |
| 117 | |
| 118 | -__BEGIN_DECLS |
| 119 | +#ifdef __cplusplus |
| 120 | +extern "C" { |
| 121 | +#endif |
| 122 | |
| 123 | /** |
| 124 | * @defgroup group_iterators 3. Iterators |
| 125 | @@ -423,6 +425,8 @@ int cgroup_get_subsys_mount_point_end(vo |
| 126 | * @} |
| 127 | */ |
| 128 | |
| 129 | -__END_DECLS |
| 130 | +#ifdef __cplusplus |
| 131 | +} |
| 132 | +#endif |
| 133 | |
| 134 | #endif /* _LIBCGROUP_ITERATORS_H */ |
| 135 | Index: libcgroup-0.41/include/libcgroup/tasks.h |
| 136 | =================================================================== |
| 137 | --- libcgroup-0.41.orig/include/libcgroup/tasks.h |
| 138 | +++ libcgroup-0.41/include/libcgroup/tasks.h |
| 139 | @@ -12,7 +12,9 @@ |
| 140 | #include <stdbool.h> |
| 141 | #endif |
| 142 | |
| 143 | -__BEGIN_DECLS |
| 144 | +#ifdef __cplusplus |
| 145 | +extern "C" { |
| 146 | +#endif |
| 147 | |
| 148 | /** Flags for cgroup_change_cgroup_uid_gid(). */ |
| 149 | enum cgflags { |
| 150 | @@ -204,6 +206,8 @@ int cgroup_register_unchanged_process(pi |
| 151 | * @} |
| 152 | * @} |
| 153 | */ |
| 154 | -__END_DECLS |
| 155 | +#ifdef __cplusplus |
| 156 | +} |
| 157 | +#endif |
| 158 | |
| 159 | #endif /* _LIBCGROUP_TASKS_H */ |
| 160 | Index: libcgroup-0.41/src/daemon/cgrulesengd.h |
| 161 | =================================================================== |
| 162 | --- libcgroup-0.41.orig/src/daemon/cgrulesengd.h |
| 163 | +++ libcgroup-0.41/src/daemon/cgrulesengd.h |
| 164 | @@ -17,7 +17,9 @@ |
| 165 | |
| 166 | #include <features.h> |
| 167 | |
| 168 | -__BEGIN_DECLS |
| 169 | +#ifdef __cplusplus |
| 170 | +extern "C" { |
| 171 | +#endif |
| 172 | |
| 173 | #include "config.h" |
| 174 | #include "libcgroup.h" |
| 175 | @@ -119,7 +121,9 @@ void cgre_flash_templates(int signum); |
| 176 | */ |
| 177 | void cgre_catch_term(int signum); |
| 178 | |
| 179 | -__END_DECLS |
| 180 | +#ifdef __cplusplus |
| 181 | +} |
| 182 | +#endif |
| 183 | |
| 184 | #endif /* _CGRULESENGD_H */ |
| 185 | |
| 186 | Index: libcgroup-0.41/src/libcgroup-internal.h |
| 187 | =================================================================== |
| 188 | --- libcgroup-0.41.orig/src/libcgroup-internal.h |
| 189 | +++ libcgroup-0.41/src/libcgroup-internal.h |
| 190 | @@ -16,7 +16,9 @@ |
| 191 | |
| 192 | #define __LIBCG_INTERNAL |
| 193 | |
| 194 | -__BEGIN_DECLS |
| 195 | +#ifdef __cplusplus |
| 196 | +extern "C" { |
| 197 | +#endif |
| 198 | |
| 199 | #include "config.h" |
| 200 | #include <fts.h> |
| 201 | @@ -279,6 +281,8 @@ extern void cgroup_dictionary_iterator_e |
| 202 | */ |
| 203 | int cg_chmod_path(const char *path, mode_t mode, int owner_is_umask); |
| 204 | |
| 205 | -__END_DECLS |
| 206 | +#ifdef __cplusplus |
| 207 | +} |
| 208 | +#endif |
| 209 | |
| 210 | #endif |
| 211 | Index: libcgroup-0.41/include/libcgroup/log.h |
| 212 | =================================================================== |
| 213 | --- libcgroup-0.41.orig/include/libcgroup/log.h |
| 214 | +++ libcgroup-0.41/include/libcgroup/log.h |
| 215 | @@ -11,7 +11,9 @@ |
| 216 | |
| 217 | #include <stdarg.h> |
| 218 | |
| 219 | -__BEGIN_DECLS |
| 220 | +#ifdef __cplusplus |
| 221 | +extern "C" { |
| 222 | +#endif |
| 223 | |
| 224 | /** |
| 225 | * @defgroup group_log 7. Logging |
| 226 | @@ -142,6 +144,8 @@ extern int cgroup_parse_log_level_str(co |
| 227 | * @} |
| 228 | * @} |
| 229 | */ |
| 230 | -__END_DECLS |
| 231 | +#ifdef __cplusplus |
| 232 | +} |
| 233 | +#endif |
| 234 | |
| 235 | #endif /* _LIBCGROUP_LOG_H */ |