1 files changed, 44 insertions, 21 deletions

diff --git a/cleanup.c b/cleanup.c
index 12ce282..883c8ca 100644
--- a/cleanup.c
+++ b/cleanup.c
@@ -54,31 +54,54 @@ _pthread_pop_cleanup (int execute)
 #ifdef _WIN32
 
           __try
-          {
-            /*
-             * Run the caller's cleanup routine.
-             */
-            (*cleanup->routine) (cleanup->arg);
-          }
+	    {
+	      /*
+	       * Run the caller's cleanup routine.
+	       */
+	      (*cleanup->routine) (cleanup->arg);
+	    }
           __except (EXCEPTION_EXECUTE_HANDLER)
-          {
-            /*
-             * A system unexpected exception had occurred
-             * running the user's cleanup routine.
-             * We get control back within this block.
-             */
-          }
-        }
-
-#else
-
-      /*
-       * Run the caller's cleanup routine.
-       */
-      (*cleanup->routine) (cleanup->arg);
+	    {
+	      /*
+	       * A system unexpected exception had occurred
+	       * running the user's cleanup routine.
+	       * We get control back within this block.
+	       */
+	    }
+      
+#else /* _WIN32 */
+
+#ifdef _cplusplus
+
+	  try
+	    {
+	      /*
+	       * Run the caller's cleanup routine.
+	       */
+	      (*cleanup->routine) (cleanup->arg);
+	    }
+	  catch(...)
+	    {
+	      /*
+	       * A system unexpected exception had occurred
+	       * running the user's cleanup routine.
+	       * We get control back within this block.
+	       */
+	    }
+
+#else /* _cplusplus */
+      
+	  /*
+	   * Run the caller's cleanup routine and FIXME: hope for the best.
+	   */
+	  (*cleanup->routine) (cleanup->arg);
+
+#endif /* _cplusplus */
 
 #endif /* _WIN32 */
 
+        }
+
       pthread_setspecific (_pthread_cleanupKey, cleanup->prev);
     }