Skip to content

Cleanups #195

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 5, 2017
Merged

Cleanups #195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/queue.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5148,6 +5148,7 @@ _dispatch_trystash_to_deferred_items(dispatch_queue_t dq, dispatch_object_t dou,
}
#endif

#if HAVE_PTHREAD_WORKQUEUE_QOS
DISPATCH_NOINLINE
static void
_dispatch_queue_push_slow(dispatch_queue_t dq, dispatch_object_t dou,
Expand All @@ -5157,6 +5158,7 @@ _dispatch_queue_push_slow(dispatch_queue_t dq, dispatch_object_t dou,
_dispatch_root_queues_init_once);
_dispatch_queue_push(dq, dou, pp);
}
#endif

DISPATCH_NOINLINE
void
Expand Down
4 changes: 3 additions & 1 deletion src/shims/android_stubs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,10 @@
(var) = (tvar))
#endif /* TAILQ_FOREACH_SAFE */

#if DISPATCH_DEBUG
#ifndef TRASHIT
# define TRASHIT(x) do {(x) = (void *)-1;} while (0)
#endif /* TRASHIT */
#endif

#endif /* __DISPATCH__ANDROID__STUBS__INTERNAL */
#endif /* __DISPATCH__ANDROID__STUBS__INTERNAL */
2 changes: 1 addition & 1 deletion src/shims/getprogname.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

#ifdef __ANDROID__
extern const char *__progname;
#endif /* __ANDROID */)
#endif /* __ANDROID */

static inline char *
getprogname(void)
Expand Down
12 changes: 12 additions & 0 deletions src/shims/linux_stubs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,18 @@
#ifndef __DISPATCH__STUBS__INTERNAL
#define __DISPATCH__STUBS__INTERNAL

#ifndef TAILQ_FOREACH_SAFE
#define TAILQ_FOREACH_SAFE(var, head, field, temp) \
for ((var) = TAILQ_FIRST((head)); \
(var) && ((temp) = TAILQ_NEXT((var), field), 1); (var) = (temp))
#endif

#if DISPATCH_DEBUG
#ifndef TRASHIT
#define TRASHIT(x) do { (x) = (void *)-1; } while (0)
#endif
#endif

/*
* Stub out defines for some mach types and related macros
*/
Expand Down