commit 28695489e392e2bd34cf4ccf8611d431808e084c
author Anthony Liguori <aliguori@us.ibm.com> Sun Mar 21 14:13:02 2010 -0500
committer Anthony Liguori <aliguori@us.ibm.com> Sun Mar 21 14:13:02 2010 -0500
tree 8edbda8b30cb4bbbd4636c1c9dbb8c6ecead181a
parent 365c4243ecdd0eb2372ce4a5bb20ded77c755c1d

Revert "Convert atexit users to exit_notifier"

This reverts commit d7234f4d7e373a708e1df9ab565a71b71b189025.

Conflicts:

	hw/xen_machine_pv.c

This should have never been committed.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

sdl.c

diff --git a/sdl.c b/sdl.c
index 8dc78cd..16a48e9 100644
--- a/sdl.c
+++ b/sdl.c
@@ -827,7 +827,7 @@
         SDL_SetCursor(guest_sprite);
 }
 
-static void sdl_cleanup(Notifier *notifier)
+static void sdl_cleanup(void)
 {
     if (guest_sprite)
         SDL_FreeCursor(guest_sprite);
@@ -840,7 +840,6 @@
     uint8_t data = 0;
     DisplayAllocator *da;
     const SDL_VideoInfo *vi;
-    static Notifier exit_notifier = { .notify = sdl_cleanup };
 
 #if defined(__APPLE__)
     /* always use generic keymaps */
@@ -893,7 +892,7 @@
     sdl_cursor_hidden = SDL_CreateCursor(&data, &data, 8, 1, 0, 0);
     sdl_cursor_normal = SDL_GetCursor();
 
-    exit_notifier_add(&exit_notifier);
+    atexit(sdl_cleanup);
     if (full_screen) {
         gui_fullscreen = 1;
         gui_fullscreen_initial_grab = 1;