Skip to content

Commit

Permalink
[BZ #6545]
Browse files Browse the repository at this point in the history
	* sysdeps/unix/sysv/linux/bits/socket.h (SCM_CREDENTIALS): Make
	available only for __USE_GNU.
  • Loading branch information
Ulrich Drepper committed Dec 9, 2008
1 parent 7105376 commit 135460f
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
4 changes: 4 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
2008-12-08 Ulrich Drepper <drepper@redhat.com>

[BZ #6545]
* sysdeps/unix/sysv/linux/bits/socket.h (SCM_CREDENTIALS): Make
available only for __USE_GNU.

* inet/Makefile (tests): Add tst-getni2.
* inet/tst-getni2.c: New file.

Expand Down
4 changes: 2 additions & 2 deletions nptl/sysdeps/pthread/pthread.h
Original file line number Diff line number Diff line change
Expand Up @@ -655,7 +655,7 @@ extern void __pthread_register_cancel (__pthread_unwind_buf_t *__buf)
/* Remove a cleanup handler installed by the matching pthread_cleanup_push.
If EXECUTE is non-zero, the handler function is called. */
# define pthread_cleanup_pop(execute) \
do; while (0); /* Empty to allow label before pthread_cleanup_pop. */ \
do { } while (0);/* Empty to allow label before pthread_cleanup_pop. */\
} while (0); \
__pthread_unregister_cancel (&__cancel_buf); \
if (execute) \
Expand Down Expand Up @@ -691,7 +691,7 @@ extern void __pthread_register_cancel_defer (__pthread_unwind_buf_t *__buf)
restores the cancellation type that was in effect when the matching
pthread_cleanup_push_defer was called. */
# define pthread_cleanup_pop_restore_np(execute) \
do; while (0); /* Empty to allow label before pthread_cleanup_pop. */ \
do { } while (0);/* Empty to allow label before pthread_cleanup_pop. */\
} while (0); \
__pthread_unregister_cancel_restore (&__cancel_buf); \
if (execute) \
Expand Down
2 changes: 1 addition & 1 deletion sysdeps/unix/sysv/linux/bits/socket.h
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ enum
{
SCM_RIGHTS = 0x01 /* Transfer file descriptors. */
#define SCM_RIGHTS SCM_RIGHTS
#ifdef __USE_BSD
#ifdef __USE_GNU
, SCM_CREDENTIALS = 0x02 /* Credentials passing. */
# define SCM_CREDENTIALS SCM_CREDENTIALS
#endif
Expand Down

0 comments on commit 135460f

Please sign in to comment.