]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
BUILD/MINOR: fix build when USE_THREAD is not defined
authorIlya Shipitsin <chipitsine@gmail.com>
Sat, 24 Mar 2018 12:17:32 +0000 (17:17 +0500)
committerWilly Tarreau <w@1wt.eu>
Mon, 26 Mar 2018 15:17:59 +0000 (17:17 +0200)
src/queue.o: In function `pendconn_redistribute':
/home/ilia/haproxy/src/queue.c:272: undefined reference to `thread_want_sync'
src/queue.o: In function `pendconn_grab_from_px':
/home/ilia/haproxy/src/queue.c:311: undefined reference to `thread_want_sync'
src/queue.o: In function `process_srv_queue':
/home/ilia/haproxy/src/queue.c:184: undefined reference to `thread_want_sync'
collect2: error: ld returned 1 exit status
make: *** [Makefile:900: haproxy] Error 1

To be backported to 1.8.

src/queue.c

index 7cad813bf061f38e61c0e23facfc4a232f4c5fb0..1c730c75c893edc004094f1aee49afa762b15e4d 100644 (file)
@@ -181,7 +181,7 @@ void process_srv_queue(struct server *s)
        HA_SPIN_UNLOCK(PROXY_LOCK,  &p->lock);
 
        if (remote)
-               thread_want_sync();
+               THREAD_WANT_SYNC();
 }
 
 /* Adds the stream <strm> to the pending connection list of server <strm>->srv
@@ -269,8 +269,7 @@ int pendconn_redistribute(struct server *s)
        HA_SPIN_UNLOCK(SERVER_LOCK, &s->lock);
 
        if (remote)
-               thread_want_sync();
-
+               THREAD_WANT_SYNC();
        return xferred;
 }
 
@@ -308,8 +307,7 @@ int pendconn_grab_from_px(struct server *s)
        HA_SPIN_UNLOCK(PROXY_LOCK, &s->proxy->lock);
 
        if (remote)
-               thread_want_sync();
-
+               THREAD_WANT_SYNC();
        return xferred;
 }