0001-fix-fix-OSIP_MONOTHREAD-compilation-error-introduced-with-epoll.patch 1.2 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344
  1. From 0e0e95dbc380c5eede3a2fc1631294a98078e30f Mon Sep 17 00:00:00 2001
  2. From: Aymeric Moizard <amoizard@gmail.com>
  3. Date: Fri, 13 Mar 2020 16:34:41 +0100
  4. Subject: fix: fix OSIP_MONOTHREAD compilation error introduced with epoll
  5. implementation
  6. Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
  7. [Retrieved from:
  8. http://git.savannah.nongnu.org/cgit/exosip.git/patch/?id=0e0e95dbc380c5eede3a2fc1631294a98078e30f]
  9. ---
  10. src/eXconf.c | 4 ++++
  11. 1 file changed, 4 insertions(+)
  12. diff --git a/src/eXconf.c b/src/eXconf.c
  13. index baf90be..6165eb3 100644
  14. --- a/src/eXconf.c
  15. +++ b/src/eXconf.c
  16. @@ -801,12 +801,15 @@ eXosip_init (struct eXosip_t *excontext)
  17. }
  18. if (excontext->poll_method == EXOSIP_USE_EPOLL_LT) {
  19. +#ifndef OSIP_MONOTHREAD
  20. struct epoll_event ev;
  21. +#endif
  22. excontext->epfdctl = epoll_create (1);
  23. if (excontext->epfdctl < 0) {
  24. return OSIP_UNDEFINED_ERROR;
  25. }
  26. +#ifndef OSIP_MONOTHREAD
  27. memset(&ev, 0, sizeof(struct epoll_event));
  28. ev.events = EPOLLIN;
  29. ev.data.fd = jpipe_get_read_descr (excontext->j_socketctl_event);
  30. @@ -815,6 +818,7 @@ eXosip_init (struct eXosip_t *excontext)
  31. _eXosip_closesocket (excontext->epfdctl);
  32. return OSIP_UNDEFINED_ERROR;
  33. }
  34. +#endif
  35. }
  36. #endif
  37. --
  38. cgit v1.2.1