From 415ee7d6e47dcb3e0906a7bebc6d52ab8ed899da Mon Sep 17 00:00:00 2001 From: Igor Pashev Date: Tue, 5 Jun 2012 02:09:04 +0400 Subject: Merged changes from kopensolaris-gnu project http://git.csclub.uwaterloo.ca/?p=kopensolaris-gnu/glibc.git Commits from 9157319 to bad8ac8. This is only partial patch, some changes to not apply and will be resovled and committed next. --- nptl/sysdeps/unix/sysv/linux/fork.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'nptl/sysdeps/unix/sysv/linux/fork.h') diff --git a/nptl/sysdeps/unix/sysv/linux/fork.h b/nptl/sysdeps/unix/sysv/linux/fork.h index dadd0dfee6..753460abb0 100644 --- a/nptl/sysdeps/unix/sysv/linux/fork.h +++ b/nptl/sysdeps/unix/sysv/linux/fork.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2002, 2003, 2006, 2007 Free Software Foundation, Inc. +/* Copyright (C) 2002, 2003, 2006 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 2002. @@ -25,7 +25,11 @@ extern unsigned long int __fork_generation attribute_hidden; extern unsigned long int *__fork_generation_pointer attribute_hidden; /* Lock to protect allocation and deallocation of fork handlers. */ +#ifndef lll_define extern int __fork_lock attribute_hidden; +#else +lll_define (extern, __fork_lock) attribute_hidden; +#endif /* Elements of the fork handler lists. */ struct fork_handler -- cgit v1.2.3