about summary refs log tree commit diff
path: root/stdlib/exit.h
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/exit.h
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/exit.h')
-rw-r--r--stdlib/exit.h11
1 files changed, 2 insertions, 9 deletions
diff --git a/stdlib/exit.h b/stdlib/exit.h
index 66819dd045..2b52dc5f7e 100644
--- a/stdlib/exit.h
+++ b/stdlib/exit.h
@@ -26,8 +26,7 @@ enum
   ef_us,
   ef_on,
   ef_at,
-  ef_cxa,
-  ef_cxa2
+  ef_cxa
 };
 
 struct exit_function
@@ -45,16 +44,10 @@ struct exit_function
 	  } on;
 	struct
 	  {
-	    void (*fn) (void *arg);
+	    void (*fn) (void *arg, int status);
 	    void *arg;
 	    void *dso_handle;
 	  } cxa;
-	struct
-	  {
-	    void (*fn) (int status, void *arg);
-	    void *arg;
-	    void *dso_handle;
-	  } cxa2;
       } func;
   };
 struct exit_function_list