Commit 767976f1c0fd76adcf827c27cc4bb923044dc25f
1 parent
99fa5ec1
Exists in
master
and in
3 other branches
Change name of wait callback type to avoid collision with mac system type
Showing
1 changed file
with
3 additions
and
3 deletions
Show diff stats
src/core/iocalls.c
| ... | ... | @@ -93,7 +93,7 @@ |
| 93 | 93 | static void (*set_poll_state)(H3270 *session, void *id, int enabled) |
| 94 | 94 | = internal_set_poll_state; |
| 95 | 95 | |
| 96 | - static int (*wait)(H3270 *session, int seconds) | |
| 96 | + static int (*wait_callback)(H3270 *session, int seconds) | |
| 97 | 97 | = internal_wait; |
| 98 | 98 | |
| 99 | 99 | static int (*event_dispatcher)(H3270 *session,int wait) |
| ... | ... | @@ -454,7 +454,7 @@ LIB3270_EXPORT int lib3270_register_io_controller(const LIB3270_IO_CONTROLLER *c |
| 454 | 454 | lib3270_register_fd_handlers(cbk->add_poll,cbk->remove_poll); |
| 455 | 455 | |
| 456 | 456 | if(cbk->Wait) |
| 457 | - wait = cbk->Wait; | |
| 457 | + wait_callback = cbk->Wait; | |
| 458 | 458 | |
| 459 | 459 | if(cbk->event_dispatcher) |
| 460 | 460 | event_dispatcher = cbk->event_dispatcher; |
| ... | ... | @@ -480,7 +480,7 @@ LIB3270_EXPORT void lib3270_main_iterate(H3270 *hSession, int block) |
| 480 | 480 | |
| 481 | 481 | LIB3270_EXPORT int lib3270_wait(H3270 *hSession, int seconds) |
| 482 | 482 | { |
| 483 | - wait(hSession,seconds); | |
| 483 | + wait_callback(hSession,seconds); | |
| 484 | 484 | return 0; |
| 485 | 485 | } |
| 486 | 486 | ... | ... |