qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From astitc...@apache.org
Subject qpid-proton git commit: PROTON-1472: Fix epoll compile errors on Fedora
Date Wed, 03 May 2017 06:44:24 GMT
Repository: qpid-proton
Updated Branches:
  refs/heads/master f8997c083 -> 050dc328c


PROTON-1472: Fix epoll compile errors on Fedora


Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/050dc328
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/050dc328
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/050dc328

Branch: refs/heads/master
Commit: 050dc328ccdcf6ae3416183cd13154c9730da914
Parents: f8997c0
Author: Andrew Stitcher <astitcher@apache.org>
Authored: Wed May 3 02:40:17 2017 -0400
Committer: Andrew Stitcher <astitcher@apache.org>
Committed: Wed May 3 02:43:34 2017 -0400

----------------------------------------------------------------------
 proton-c/src/proactor/epoll.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/050dc328/proton-c/src/proactor/epoll.c
----------------------------------------------------------------------
diff --git a/proton-c/src/proactor/epoll.c b/proton-c/src/proactor/epoll.c
index 0f09c7c..94789f2 100644
--- a/proton-c/src/proactor/epoll.c
+++ b/proton-c/src/proactor/epoll.c
@@ -20,7 +20,7 @@
  */
 
 /* Enable POSIX features for pthread.h */
-#define _POSIX_C_SOURCE 200809L
+#define _GNU_SOURCE
 
 #include "../core/log_private.h"
 #include "proactor-internal.h"
@@ -90,7 +90,6 @@ static void pmutex_finalize(pthread_mutex_t *m) { pthread_mutex_destroy(m);
}
 static inline void lock(pmutex *m) { pthread_mutex_lock(m); }
 static inline void unlock(pmutex *m) { pthread_mutex_unlock(m); }
 
-typedef struct psocket_t psocket_t;
 typedef enum {
   WAKE,   /* see if any work to do in proactor/psocket context */
   PCONNECTION_IO,
@@ -100,7 +99,7 @@ typedef enum {
 
 // Data to use with epoll.
 typedef struct epoll_extended_t {
-  psocket_t *psocket;  // pconnection, listener, or NULL -> proactor
+  struct psocket_t *psocket;  // pconnection, listener, or NULL -> proactor
   int fd;
   epoll_type_t type;   // io/timer/wakeup
   uint32_t wanted;     // events to poll for
@@ -120,7 +119,7 @@ typedef struct ptimer_t {
   int skip_count;
 } ptimer_t;
 
-static bool ptimer_init(ptimer_t *pt, psocket_t *ps) {
+static bool ptimer_init(ptimer_t *pt, struct psocket_t *ps) {
   pt->timerfd = timerfd_create(CLOCK_MONOTONIC, TFD_NONBLOCK);
   if (pt->timerfd < 0) return false;
   pmutex_init(&pt->mutex);


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message