From 56b9efc0f3f0ebf8a9c7f70d3c9c3fb47f86c1d6 Mon Sep 17 00:00:00 2001
From: stefanf <stefanf@FreeBSD.org>
Date: Mon, 12 Sep 2005 13:46:32 +0000
Subject: Move the declaration of __cleanup to libc_private.h as it is used in
 both stdio/ and stdlib/.  Don't define __cleanup twice.

---
 lib/libc/stdlib/abort.c | 2 +-
 lib/libc/stdlib/exit.c  | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'lib/libc/stdlib')

diff --git a/lib/libc/stdlib/abort.c b/lib/libc/stdlib/abort.c
index 36cd15b..468a9bf 100644
--- a/lib/libc/stdlib/abort.c
+++ b/lib/libc/stdlib/abort.c
@@ -45,7 +45,7 @@ __FBSDID("$FreeBSD$");
 #include <pthread.h>
 #include "un-namespace.h"
 
-void (*__cleanup)();
+#include "libc_private.h"
 
 void
 abort()
diff --git a/lib/libc/stdlib/exit.c b/lib/libc/stdlib/exit.c
index 83abdbd..cafb127 100644
--- a/lib/libc/stdlib/exit.c
+++ b/lib/libc/stdlib/exit.c
@@ -41,9 +41,11 @@ __FBSDID("$FreeBSD$");
 #include <stdlib.h>
 #include <unistd.h>
 #include "un-namespace.h"
+
 #include "atexit.h"
+#include "libc_private.h"
 
-void (*__cleanup)();
+void (*__cleanup)(void);
 
 /*
  * This variable is zero until a process has created a thread.
-- 
cgit v1.1