about summary refs log tree commit diff
path: root/stdlib/cxa_atexit.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2001-01-12 07:29:55 +0000
committerUlrich Drepper <drepper@redhat.com>2001-01-12 07:29:55 +0000
commit5ef50d00ded8bb0934c2aef6c9f06acf23f66cb7 (patch)
tree20f76d7169cf0550d4224e7a2b62aba4943bc4c1 /stdlib/cxa_atexit.c
parent7e36861e77d7edde557ebf1172271e922c9a51ff (diff)
downloadglibc-5ef50d00ded8bb0934c2aef6c9f06acf23f66cb7.tar.gz
glibc-5ef50d00ded8bb0934c2aef6c9f06acf23f66cb7.tar.xz
glibc-5ef50d00ded8bb0934c2aef6c9f06acf23f66cb7.zip
Update.
2001-01-11  Jakub Jelinek  <jakub@redhat.com>

	* stdlib/cxa_atexit.c (__cxa_atexit): Cast to (void *, int) func.
	* stdlib/cxa_finalize.c (__cxa_finalize): Add hidden second argument.
	* stdlib/cxa_on_exit.c: Remove.
	* stdlib/Makefile: Revert last patch.
	* stdlib/Versions: Likewise.
	* include/stdlib.h: Likewise.
	* stdlib/exit.h: Revert last patch.
	(struct exit_function): Add second argument to cxa fn.
	* stdlib/exit.c: Revert last patch.
	(exit): Add hidden second argument.
Diffstat (limited to 'stdlib/cxa_atexit.c')
-rw-r--r--stdlib/cxa_atexit.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/stdlib/cxa_atexit.c b/stdlib/cxa_atexit.c
index 180d74a54d..e07d0eda35 100644
--- a/stdlib/cxa_atexit.c
+++ b/stdlib/cxa_atexit.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1999, 2001 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -31,7 +31,7 @@ __cxa_atexit (void (*func) (void *), void *arg, void *d)
     return -1;
 
   new->flavor = ef_cxa;
-  new->func.cxa.fn = func;
+  new->func.cxa.fn = (void (*) (void *, int)) func;
   new->func.cxa.arg = arg;
   new->func.cxa.dso_handle = d;
   return 0;