diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-10-04 05:17:17 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-10-04 05:17:17 +0000 |
commit | f4bde791f640f926bc7f18961330e37b5b868914 (patch) | |
tree | 4e42b2b61deec10c83ccfbc246b77e3aa868ed52 /src/testbed/testbed_api.c | |
parent | faf0396be4edcb8f322784037f47a819f4353f3e (diff) | |
download | gnunet-f4bde791f640f926bc7f18961330e37b5b868914.tar.gz gnunet-f4bde791f640f926bc7f18961330e37b5b868914.zip |
addressing name conflict with PS_STOPPED on MinGW
Diffstat (limited to 'src/testbed/testbed_api.c')
-rw-r--r-- | src/testbed/testbed_api.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/testbed/testbed_api.c b/src/testbed/testbed_api.c index e328456de..3539eae03 100644 --- a/src/testbed/testbed_api.c +++ b/src/testbed/testbed_api.c | |||
@@ -525,7 +525,7 @@ handle_peer_create_success (struct GNUNET_TESTBED_Controller *c, | |||
525 | GNUNET_assert (NULL != data->peer); | 525 | GNUNET_assert (NULL != data->peer); |
526 | peer = data->peer; | 526 | peer = data->peer; |
527 | GNUNET_assert (peer->unique_id == ntohl (msg->peer_id)); | 527 | GNUNET_assert (peer->unique_id == ntohl (msg->peer_id)); |
528 | peer->state = PS_CREATED; | 528 | peer->state = TESTBED_PS_CREATED; |
529 | GNUNET_TESTBED_peer_register_ (peer); | 529 | GNUNET_TESTBED_peer_register_ (peer); |
530 | cb = data->cb; | 530 | cb = data->cb; |
531 | cls = data->cls; | 531 | cls = data->cls; |
@@ -589,12 +589,12 @@ handle_peer_event (struct GNUNET_TESTBED_Controller *c, | |||
589 | switch (event.type) | 589 | switch (event.type) |
590 | { | 590 | { |
591 | case GNUNET_TESTBED_ET_PEER_START: | 591 | case GNUNET_TESTBED_ET_PEER_START: |
592 | peer->state = PS_STARTED; | 592 | peer->state = TESTBED_PS_STARTED; |
593 | event.details.peer_start.host = peer->host; | 593 | event.details.peer_start.host = peer->host; |
594 | event.details.peer_start.peer = peer; | 594 | event.details.peer_start.peer = peer; |
595 | break; | 595 | break; |
596 | case GNUNET_TESTBED_ET_PEER_STOP: | 596 | case GNUNET_TESTBED_ET_PEER_STOP: |
597 | peer->state = PS_STOPPED; | 597 | peer->state = TESTBED_PS_STOPPED; |
598 | event.details.peer_stop.peer = peer; | 598 | event.details.peer_stop.peer = peer; |
599 | break; | 599 | break; |
600 | default: | 600 | default: |