Skip to content
This repository has been archived by the owner on May 4, 2018. It is now read-only.

Commit

Permalink
Browse files Browse the repository at this point in the history
unix: move libeio specific fields to uv-unix.h
  • Loading branch information
bnoordhuis committed Mar 21, 2012
1 parent 49d4e18 commit ef47a62
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 4 additions & 0 deletions include/uv-private/uv-unix.h
Expand Up @@ -78,6 +78,10 @@ typedef void* uv_lib_t;
/* Poll result queue */ \
eio_channel uv_eio_channel; \
struct ev_loop* ev; \
/* Various thing for libeio. */ \
uv_async_t uv_eio_want_poll_notifier; \
uv_async_t uv_eio_done_poll_notifier; \
uv_idle_t uv_eio_poller; \
UV_LOOP_PRIVATE_PLATFORM_FIELDS

#define UV_REQ_BUFSML_SIZE (4)
Expand Down
4 changes: 0 additions & 4 deletions include/uv.h
Expand Up @@ -1485,10 +1485,6 @@ struct uv_loop_s {
UV_LOOP_PRIVATE_FIELDS
/* RB_HEAD(uv__ares_tasks, uv_ares_task_t) */
struct uv__ares_tasks { uv_ares_task_t* rbh_root; } uv_ares_handles_;
/* Various thing for libeio. */
uv_async_t uv_eio_want_poll_notifier;
uv_async_t uv_eio_done_poll_notifier;
uv_idle_t uv_eio_poller;
/* Diagnostic counters */
uv_counters_t counters;
/* The last error */
Expand Down

5 comments on commit ef47a62

@dvv
Copy link
Contributor

@dvv dvv commented on ef47a62 Mar 27, 2012

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Linux dvv 3.0.0-16-generic #29-Ubuntu SMP Tue Feb 14 12:48:51 UTC 2012 x86_64 x86_64 x86_64 GNU/Linux

src/uv.h:1488:14: error: duplicate member ‘uv_eio_want_poll_notifier’
src/uv.h:1489:14: error: duplicate member ‘uv_eio_done_poll_notifier’
src/uv.h:1490:13: error: duplicate member ‘uv_eio_poller’

I believe that is why Travis tag is red.

@bnoordhuis
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dvv: I think you have a header conflict. Travis has never been green by the way, there's a test that always fails on Unices. :-)

@dvv
Copy link
Contributor

@dvv dvv commented on ef47a62 Mar 27, 2012

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Conflict like what, e.g.? Double inclusion? I just clone and type "make".

@bnoordhuis
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know exactly but the fact that uv.h is in src/ instead of include/ means your setup is not pristine.

@dvv
Copy link
Contributor

@dvv dvv commented on ef47a62 Mar 27, 2012

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. Please, close this.

Please sign in to comment.