From owner-svn-src-all@FreeBSD.ORG  Tue Jan 19 23:07:12 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 604D91065679;
	Tue, 19 Jan 2010 23:07:12 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4FCBC8FC13;
	Tue, 19 Jan 2010 23:07:12 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o0JN7Ce3034321;
	Tue, 19 Jan 2010 23:07:12 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0JN7CKu034318;
	Tue, 19 Jan 2010 23:07:12 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <201001192307.o0JN7CKu034318@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Tue, 19 Jan 2010 23:07:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r202661 - head/lib/libc/gen
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 19 Jan 2010 23:07:12 -0000

Author: ed
Date: Tue Jan 19 23:07:12 2010
New Revision: 202661
URL: http://svn.freebsd.org/changeset/base/202661

Log:
  Revert r202447 by re-exposing the old uname(3) function.
  
  It makes hardly any sense to expose a symbol which should only be
  provided for binary compatibility, but it seems we don't have a lot of
  choice here. There are many autoconf scripts out there that try to
  create a binary that links against the old symbol to see whether
  uname(3) is present. These scripts fail to detect uname(3) now.
  
  It should be noted that the behaviour we implement is not against the
  standards:
  
  | The following shall be declared as a function and may also be defined
  | as a macro:
  |
  | int uname(struct utsname *);

Modified:
  head/lib/libc/gen/Symbol.map
  head/lib/libc/gen/uname.c

Modified: head/lib/libc/gen/Symbol.map
==============================================================================
--- head/lib/libc/gen/Symbol.map	Tue Jan 19 23:03:08 2010	(r202660)
+++ head/lib/libc/gen/Symbol.map	Tue Jan 19 23:07:12 2010	(r202661)
@@ -296,6 +296,7 @@ FBSD_1.0 {
 	tcflow;
 	ualarm;
 	ulimit;
+	uname;
 	unvis;
 	strunvis;
 	strunvisx;

Modified: head/lib/libc/gen/uname.c
==============================================================================
--- head/lib/libc/gen/uname.c	Tue Jan 19 23:03:08 2010	(r202660)
+++ head/lib/libc/gen/uname.c	Tue Jan 19 23:07:12 2010	(r202661)
@@ -33,15 +33,15 @@ static char sccsid[] = "From: @(#)uname.
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#define uname wrapped_uname
 #include <sys/param.h>
 #include <sys/sysctl.h>
 #include <sys/utsname.h>
 #include <errno.h>
+#undef uname
 
 int
-__uname(struct utsname *name)
+uname(struct utsname *name)
 {
 	return __xuname(32, name);
 }
-
-__sym_compat(uname, __uname, FBSD_1.0);