diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | nptl/sysdeps/pthread/pthread.h | 4 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/bits/socket.h | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index c3f2287cc1..3d676ba7f5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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. diff --git a/nptl/sysdeps/pthread/pthread.h b/nptl/sysdeps/pthread/pthread.h index d5ffd383f5..cc7472eaff 100644 --- a/nptl/sysdeps/pthread/pthread.h +++ b/nptl/sysdeps/pthread/pthread.h @@ -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) \ @@ -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) \ diff --git a/sysdeps/unix/sysv/linux/bits/socket.h b/sysdeps/unix/sysv/linux/bits/socket.h index 87c3b91802..72c7335ae5 100644 --- a/sysdeps/unix/sysv/linux/bits/socket.h +++ b/sysdeps/unix/sysv/linux/bits/socket.h @@ -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 |