Annotation of pkgsrc/net/haproxy/patches/patch-include_haproxy_queue-t.h, revision 1.1
1.1 ! jperkin 1: $NetBSD$
! 2:
! 3: Avoid 'struct queue' conflict.
! 4:
! 5: --- include/haproxy/queue-t.h.orig 2021-11-23 14:40:21.000000000 +0000
! 6: +++ include/haproxy/queue-t.h
! 7: @@ -28,19 +28,19 @@
! 8: struct proxy;
! 9: struct server;
! 10: struct stream;
! 11: -struct queue;
! 12: +struct haqueue;
! 13:
! 14: struct pendconn {
! 15: int strm_flags; /* stream flags */
! 16: unsigned int queue_idx; /* value of proxy/server queue_idx at time of enqueue */
! 17: struct stream *strm;
! 18: - struct queue *queue; /* the queue the entry is queued into */
! 19: + struct haqueue *queue; /* the queue the entry is queued into */
! 20: struct server *target; /* the server that was assigned, = srv except if srv==NULL */
! 21: struct eb32_node node;
! 22: __decl_thread(HA_SPINLOCK_T del_lock); /* use before removal, always under queue's lock */
! 23: };
! 24:
! 25: -struct queue {
! 26: +struct haqueue {
! 27: struct eb_root head; /* queued pendconnds */
! 28: struct proxy *px; /* the proxy we're waiting for, never NULL in queue */
! 29: struct server *sv; /* the server we are waiting for, may be NULL if don't care */
CVSweb <webmaster@jp.NetBSD.org>