Skip to content
This repository
Browse code

Fix doxygen to use new macro conventions

  • Loading branch information...
commit da455e92f5e8d946835d7ced883e4739d0234108 1 parent 946b584
Nick Mathewson authored
2  Doxyfile
@@ -239,7 +239,7 @@ INCLUDE_FILE_PATTERNS =
239 239 # undefined via #undef or recursively expanded use the := operator
240 240 # instead of the = operator.
241 241
242   -PREDEFINED = TAILQ_ENTRY RB_ENTRY _EVENT_DEFINED_TQENTRY _EVENT_IN_DOXYGEN
  242 +PREDEFINED = TAILQ_ENTRY RB_ENTRY EVENT_DEFINED_TQENTRY_ EVENT_IN_DOXYGEN_
243 243
244 244 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
245 245 # this tag can be used to specify a list of macro names that should be expanded.
2  include/event2/buffer.h
@@ -93,7 +93,7 @@ extern "C" {
93 93 @see event2/event.h for more information
94 94 */
95 95 struct evbuffer
96   -#ifdef _EVENT_IN_DOXYGEN
  96 +#ifdef EVENT_IN_DOXYGEN_
97 97 {}
98 98 #endif
99 99 ;
2  include/event2/bufferevent.h
@@ -109,7 +109,7 @@ extern "C" {
109 109 @see event2/bufferevent.h
110 110 */
111 111 struct bufferevent
112   -#ifdef _EVENT_IN_DOXYGEN
  112 +#ifdef EVENT_IN_DOXYGEN_
113 113 {}
114 114 #endif
115 115 ;
2  include/event2/bufferevent_ssl.h
@@ -52,7 +52,7 @@ enum bufferevent_ssl_state {
52 52 BUFFEREVENT_SSL_ACCEPTING = 2
53 53 };
54 54
55   -#if defined(EVENT__HAVE_OPENSSL) || defined(_EVENT_IN_DOXYGEN)
  55 +#if defined(EVENT__HAVE_OPENSSL) || defined(EVENT_IN_DOXYGEN_)
56 56 /**
57 57 Create a new SSL bufferevent to send its data over another bufferevent.
58 58
8 include/event2/event.h
@@ -211,7 +211,7 @@ extern "C" {
211 211 * event_base_new_with_config()
212 212 */
213 213 struct event_base
214   -#ifdef _EVENT_IN_DOXYGEN
  214 +#ifdef EVENT_IN_DOXYGEN_
215 215 {/*Empty body so that doxygen will generate documentation here.*/}
216 216 #endif
217 217 ;
@@ -270,7 +270,7 @@ struct event_base
270 270 * event_priority_set()
271 271 */
272 272 struct event
273   -#ifdef _EVENT_IN_DOXYGEN
  273 +#ifdef EVENT_IN_DOXYGEN_
274 274 {/*Empty body so that doxygen will generate documentation here.*/}
275 275 #endif
276 276 ;
@@ -289,7 +289,7 @@ struct event
289 289 * event_config_set_flag(), event_config_set_num_cpus_hint()
290 290 */
291 291 struct event_config
292   -#ifdef _EVENT_IN_DOXYGEN
  292 +#ifdef EVENT_IN_DOXYGEN_
293 293 {/*Empty body so that doxygen will generate documentation here.*/}
294 294 #endif
295 295 ;
@@ -1214,7 +1214,7 @@ int event_priority_set(struct event *, int);
1214 1214 const struct timeval *event_base_init_common_timeout(struct event_base *base,
1215 1215 const struct timeval *duration);
1216 1216
1217   -#if !defined(EVENT__DISABLE_MM_REPLACEMENT) || defined(_EVENT_IN_DOXYGEN)
  1217 +#if !defined(EVENT__DISABLE_MM_REPLACEMENT) || defined(EVENT_IN_DOXYGEN_)
1218 1218 /**
1219 1219 Override the functions that Libevent uses for memory management.
1220 1220
6 include/event2/thread.h
@@ -69,7 +69,7 @@ extern "C" {
69 69 #define EVTHREAD_TRY 0x10
70 70 /**@}*/
71 71
72   -#if !defined(EVENT__DISABLE_THREAD_SUPPORT) || defined(_EVENT_IN_DOXYGEN)
  72 +#if !defined(EVENT__DISABLE_THREAD_SUPPORT) || defined(EVENT_IN_DOXYGEN_)
73 73
74 74 #define EVTHREAD_LOCK_API_VERSION 1
75 75
@@ -187,7 +187,7 @@ int evthread_set_condition_callbacks(
187 187 void evthread_set_id_callback(
188 188 unsigned long (*id_fn)(void));
189 189
190   -#if (defined(_WIN32) && !defined(EVENT__DISABLE_THREAD_SUPPORT)) || defined(_EVENT_IN_DOXYGEN)
  190 +#if (defined(_WIN32) && !defined(EVENT__DISABLE_THREAD_SUPPORT)) || defined(EVENT_IN_DOXYGEN_)
191 191 /** Sets up Libevent for use with Windows builtin locking and thread ID
192 192 functions. Unavailable if Libevent is not built for Windows.
193 193
@@ -199,7 +199,7 @@ int evthread_use_windows_threads(void);
199 199 #define EVTHREAD_USE_WINDOWS_THREADS_IMPLEMENTED 1
200 200 #endif
201 201
202   -#if defined(EVENT__HAVE_PTHREADS) || defined(_EVENT_IN_DOXYGEN)
  202 +#if defined(EVENT__HAVE_PTHREADS) || defined(EVENT_IN_DOXYGEN_)
203 203 /** Sets up Libevent for use with Pthreads locking and thread ID functions.
204 204 Unavailable if Libevent is not build for use with pthreads. Requires
205 205 libraries to link against Libevent_pthreads as well as Libevent.
16 include/event2/util.h
@@ -115,7 +115,7 @@ extern "C" {
115 115 #elif EVENT__SIZEOF_LONG == 8
116 116 #define ev_uint64_t unsigned long
117 117 #define ev_int64_t long
118   -#elif defined(_EVENT_IN_DOXYGEN)
  118 +#elif defined(EVENT_IN_DOXYGEN_)
119 119 #define ev_uint64_t ...
120 120 #define ev_int64_t ...
121 121 #else
@@ -134,7 +134,7 @@ extern "C" {
134 134 #elif EVENT__SIZEOF_INT == 4
135 135 #define ev_uint32_t unsigned int
136 136 #define ev_int32_t signed int
137   -#elif defined(_EVENT_IN_DOXYGEN)
  137 +#elif defined(EVENT_IN_DOXYGEN_)
138 138 #define ev_uint32_t ...
139 139 #define ev_int32_t ...
140 140 #else
@@ -153,7 +153,7 @@ extern "C" {
153 153 #elif EVENT__SIZEOF_SHORT == 2
154 154 #define ev_uint16_t unsigned short
155 155 #define ev_int16_t signed short
156   -#elif defined(_EVENT_IN_DOXYGEN)
  156 +#elif defined(EVENT_IN_DOXYGEN_)
157 157 #define ev_uint16_t ...
158 158 #define ev_int16_t ...
159 159 #else
@@ -163,7 +163,7 @@ extern "C" {
163 163 #ifdef EVENT__HAVE_UINT8_T
164 164 #define ev_uint8_t uint8_t
165 165 #define ev_int8_t int8_t
166   -#elif defined(_EVENT_IN_DOXYGEN)
  166 +#elif defined(EVENT_IN_DOXYGEN_)
167 167 #define ev_uint8_t ...
168 168 #define ev_int8_t ...
169 169 #else
@@ -180,7 +180,7 @@ extern "C" {
180 180 #elif EVENT__SIZEOF_VOID_P <= 8
181 181 #define ev_uintptr_t ev_uint64_t
182 182 #define ev_intptr_t ev_int64_t
183   -#elif defined(_EVENT_IN_DOXYGEN)
  183 +#elif defined(EVENT_IN_DOXYGEN_)
184 184 #define ev_uintptr_t ...
185 185 #define ev_intptr_t ...
186 186 #else
@@ -206,7 +206,7 @@ extern "C" {
206 206 #define ev_off_t ev_int64_t
207 207 #elif EVENT__SIZEOF_OFF_T == 4
208 208 #define ev_off_t ev_int32_t
209   -#elif defined(_EVENT_IN_DOXYGEN)
  209 +#elif defined(EVENT_IN_DOXYGEN_)
210 210 #define ev_off_t ...
211 211 #else
212 212 #define ev_off_t off_t
@@ -253,7 +253,7 @@ extern "C" {
253 253 #elif EVENT__SIZEOF_SIZE_T == 4
254 254 #define EV_SIZE_MAX EV_UINT32_MAX
255 255 #define EV_SSIZE_MAX EV_INT32_MAX
256   -#elif defined(_EVENT_IN_DOXYGEN)
  256 +#elif defined(EVENT_IN_DOXYGEN_)
257 257 #define EV_SIZE_MAX ...
258 258 #define EV_SSIZE_MAX ...
259 259 #else
@@ -359,7 +359,7 @@ int evutil_make_tcp_listen_socket_deferred(evutil_socket_t sock);
359 359 int evutil_socket_geterror(evutil_socket_t sock);
360 360 /** Convert a socket error to a string. */
361 361 const char *evutil_socket_error_to_string(int errcode);
362   -#elif defined(_EVENT_IN_DOXYGEN)
  362 +#elif defined(EVENT_IN_DOXYGEN_)
363 363 /**
364 364 @name Socket error functions
365 365

0 comments on commit da455e9

Please sign in to comment.
Something went wrong with that request. Please try again.