Merge pull request #75 from gymbombom/master

thpool.c:458 ~ 464
This commit is contained in:
Manos 2020-05-25 14:20:46 +01:00 committed by GitHub
commit 0e1f9e8f17
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -456,11 +456,7 @@ static void jobqueue_push(jobqueue* jobqueue_p, struct job* newjob){
/* Get first job from queue(removes it from queue) /* Get first job from queue(removes it from queue)
<<<<<<< HEAD
*
* Notice: Caller MUST hold a mutex * Notice: Caller MUST hold a mutex
=======
>>>>>>> da2c0fe45e43ce0937f272c8cd2704bdc0afb490
*/ */
static struct job* jobqueue_pull(jobqueue* jobqueue_p){ static struct job* jobqueue_pull(jobqueue* jobqueue_p){