Skip to content

Commit 1edfa0e

Browse files
bluetechbluetech
committed
Move XKB_EXPORT to headers
The Windows dllexport annotation wants to be on the declarations, not the definitions. Signed-off-by: Ran Benita <[email protected]>
1 parent d75702b commit 1edfa0e

20 files changed

+292
-287
lines changed

‎include/xkbcommon/xkbcommon-compose.h

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ enum xkb_compose_format {
214214
*
215215
* @memberof xkb_compose_table
216216
*/
217-
struct xkb_compose_table *
217+
XKB_EXPORT struct xkb_compose_table *
218218
xkb_compose_table_new_from_locale(struct xkb_context *context,
219219
const char *locale,
220220
enum xkb_compose_compile_flags flags);
@@ -238,7 +238,7 @@ xkb_compose_table_new_from_locale(struct xkb_context *context,
238238
*
239239
* @memberof xkb_compose_table
240240
*/
241-
struct xkb_compose_table *
241+
XKB_EXPORT struct xkb_compose_table *
242242
xkb_compose_table_new_from_file(struct xkb_context *context,
243243
FILE *file,
244244
const char *locale,
@@ -254,7 +254,7 @@ xkb_compose_table_new_from_file(struct xkb_context *context,
254254
* @see xkb_compose_table_new_from_file()
255255
* @memberof xkb_compose_table
256256
*/
257-
struct xkb_compose_table *
257+
XKB_EXPORT struct xkb_compose_table *
258258
xkb_compose_table_new_from_buffer(struct xkb_context *context,
259259
const char *buffer, size_t length,
260260
const char *locale,
@@ -268,7 +268,7 @@ xkb_compose_table_new_from_buffer(struct xkb_context *context,
268268
*
269269
* @memberof xkb_compose_table
270270
*/
271-
struct xkb_compose_table *
271+
XKB_EXPORT struct xkb_compose_table *
272272
xkb_compose_table_ref(struct xkb_compose_table *table);
273273

274274
/**
@@ -278,7 +278,7 @@ xkb_compose_table_ref(struct xkb_compose_table *table);
278278
*
279279
* @memberof xkb_compose_table
280280
*/
281-
void
281+
XKB_EXPORT void
282282
xkb_compose_table_unref(struct xkb_compose_table *table);
283283

284284
/**
@@ -314,7 +314,7 @@ struct xkb_compose_table_entry;
314314
* @memberof xkb_compose_table_entry
315315
* @since 1.6.0
316316
*/
317-
const xkb_keysym_t *
317+
XKB_EXPORT const xkb_keysym_t *
318318
xkb_compose_table_entry_sequence(struct xkb_compose_table_entry *entry,
319319
size_t *sequence_length);
320320

@@ -335,7 +335,7 @@ xkb_compose_table_entry_sequence(struct xkb_compose_table_entry *entry,
335335
* @memberof xkb_compose_table_entry
336336
* @since 1.6.0
337337
*/
338-
xkb_keysym_t
338+
XKB_EXPORT xkb_keysym_t
339339
xkb_compose_table_entry_keysym(struct xkb_compose_table_entry *entry);
340340

341341
/**
@@ -357,7 +357,7 @@ xkb_compose_table_entry_keysym(struct xkb_compose_table_entry *entry);
357357
* @memberof xkb_compose_table_entry
358358
* @since 1.6.0
359359
*/
360-
const char *
360+
XKB_EXPORT const char *
361361
xkb_compose_table_entry_utf8(struct xkb_compose_table_entry *entry);
362362

363363
/**
@@ -389,7 +389,7 @@ struct xkb_compose_table_iterator;
389389
* @sa xkb_compose_table_iterator_free()
390390
* @since 1.6.0
391391
*/
392-
struct xkb_compose_table_iterator *
392+
XKB_EXPORT struct xkb_compose_table_iterator *
393393
xkb_compose_table_iterator_new(struct xkb_compose_table *table);
394394

395395
/**
@@ -398,7 +398,7 @@ xkb_compose_table_iterator_new(struct xkb_compose_table *table);
398398
* @memberof xkb_compose_table_iterator
399399
* @since 1.6.0
400400
*/
401-
void
401+
XKB_EXPORT void
402402
xkb_compose_table_iterator_free(struct xkb_compose_table_iterator *iter);
403403

404404
/**
@@ -415,7 +415,7 @@ xkb_compose_table_iterator_free(struct xkb_compose_table_iterator *iter);
415415
* @memberof xkb_compose_table_iterator
416416
* @since 1.6.0
417417
*/
418-
struct xkb_compose_table_entry *
418+
XKB_EXPORT struct xkb_compose_table_entry *
419419
xkb_compose_table_iterator_next(struct xkb_compose_table_iterator *iter);
420420

421421
/** Flags for compose state creation. */
@@ -436,7 +436,7 @@ enum xkb_compose_state_flags {
436436
*
437437
* @memberof xkb_compose_state
438438
*/
439-
struct xkb_compose_state *
439+
XKB_EXPORT struct xkb_compose_state *
440440
xkb_compose_state_new(struct xkb_compose_table *table,
441441
enum xkb_compose_state_flags flags);
442442

@@ -447,7 +447,7 @@ xkb_compose_state_new(struct xkb_compose_table *table,
447447
*
448448
* @memberof xkb_compose_state
449449
*/
450-
struct xkb_compose_state *
450+
XKB_EXPORT struct xkb_compose_state *
451451
xkb_compose_state_ref(struct xkb_compose_state *state);
452452

453453
/**
@@ -457,7 +457,7 @@ xkb_compose_state_ref(struct xkb_compose_state *state);
457457
*
458458
* @memberof xkb_compose_state
459459
*/
460-
void
460+
XKB_EXPORT void
461461
xkb_compose_state_unref(struct xkb_compose_state *state);
462462

463463
/**
@@ -472,7 +472,7 @@ xkb_compose_state_unref(struct xkb_compose_state *state);
472472
*
473473
* @memberof xkb_compose_state
474474
*/
475-
struct xkb_compose_table *
475+
XKB_EXPORT struct xkb_compose_table *
476476
xkb_compose_state_get_compose_table(struct xkb_compose_state *state);
477477

478478
/** Status of the Compose sequence state machine. */
@@ -540,7 +540,7 @@ enum xkb_compose_feed_result {
540540
*
541541
* @memberof xkb_compose_state
542542
*/
543-
enum xkb_compose_feed_result
543+
XKB_EXPORT enum xkb_compose_feed_result
544544
xkb_compose_state_feed(struct xkb_compose_state *state,
545545
xkb_keysym_t keysym);
546546

@@ -552,7 +552,7 @@ xkb_compose_state_feed(struct xkb_compose_state *state,
552552
*
553553
* @memberof xkb_compose_state
554554
*/
555-
void
555+
XKB_EXPORT void
556556
xkb_compose_state_reset(struct xkb_compose_state *state);
557557

558558
/**
@@ -561,7 +561,7 @@ xkb_compose_state_reset(struct xkb_compose_state *state);
561561
* @see xkb_compose_status
562562
* @memberof xkb_compose_state
563563
**/
564-
enum xkb_compose_status
564+
XKB_EXPORT enum xkb_compose_status
565565
xkb_compose_state_get_status(struct xkb_compose_state *state);
566566

567567
/**
@@ -592,7 +592,7 @@ xkb_compose_state_get_status(struct xkb_compose_state *state);
592592
*
593593
* @memberof xkb_compose_state
594594
**/
595-
int
595+
XKB_EXPORT int
596596
xkb_compose_state_get_utf8(struct xkb_compose_state *state,
597597
char *buffer, size_t size);
598598

@@ -607,7 +607,7 @@ xkb_compose_state_get_utf8(struct xkb_compose_state *state,
607607
*
608608
* @memberof xkb_compose_state
609609
**/
610-
xkb_keysym_t
610+
XKB_EXPORT xkb_keysym_t
611611
xkb_compose_state_get_one_sym(struct xkb_compose_state *state);
612612

613613
/** @} */

‎include/xkbcommon/xkbcommon-x11.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ enum xkb_x11_setup_xkb_extension_flags {
145145
*
146146
* @returns 1 on success, or 0 on failure.
147147
*/
148-
int
148+
XKB_EXPORT int
149149
xkb_x11_setup_xkb_extension(xcb_connection_t *connection,
150150
uint16_t major_xkb_version,
151151
uint16_t minor_xkb_version,
@@ -163,7 +163,7 @@ xkb_x11_setup_xkb_extension(xcb_connection_t *connection,
163163
* @returns A device ID which may be used with other xkb_x11_* functions,
164164
* or -1 on failure.
165165
*/
166-
int32_t
166+
XKB_EXPORT int32_t
167167
xkb_x11_get_core_keyboard_device_id(xcb_connection_t *connection);
168168

169169
/**
@@ -188,7 +188,7 @@ xkb_x11_get_core_keyboard_device_id(xcb_connection_t *connection);
188188
*
189189
* @memberof xkb_keymap
190190
*/
191-
struct xkb_keymap *
191+
XKB_EXPORT struct xkb_keymap *
192192
xkb_x11_keymap_new_from_device(struct xkb_context *context,
193193
xcb_connection_t *connection,
194194
int32_t device_id,
@@ -212,7 +212,7 @@ xkb_x11_keymap_new_from_device(struct xkb_context *context,
212212
*
213213
* @memberof xkb_state
214214
*/
215-
struct xkb_state *
215+
XKB_EXPORT struct xkb_state *
216216
xkb_x11_state_new_from_device(struct xkb_keymap *keymap,
217217
xcb_connection_t *connection,
218218
int32_t device_id);

0 commit comments

Comments
 (0)