[Spread-cvs] commit: r632 - in trunk/libspread-util: include src

[jschultz at spread.org]

Author: jschultz
Date: 2014-01-06 15:07:22 -0500 (Mon, 06 Jan 2014)
New Revision: 632

Modified:
   trunk/libspread-util/include/spu_system_defs_windows.h
   trunk/libspread-util/src/alarm.c
Log:
Slight rework of Juan's windows patch


Modified: trunk/libspread-util/include/spu_system_defs_windows.h
===================================================================
--- trunk/libspread-util/include/spu_system_defs_windows.h	2014-01-06 19:47:15 UTC (rev 631)
+++ trunk/libspread-util/include/spu_system_defs_windows.h	2014-01-06 20:07:22 UTC (rev 632)
@@ -5,7 +5,7 @@
 #error "system_defs_windows.h should never be directly included. Include system_defs.h."
 #endif
 
-#define         LOC_INLINE      __inline__
+#define         LOC_INLINE
 
 #ifndef int16
 #define int16 short

Modified: trunk/libspread-util/src/alarm.c
===================================================================
--- trunk/libspread-util/src/alarm.c	2014-01-06 19:47:15 UTC (rev 631)
+++ trunk/libspread-util/src/alarm.c	2014-01-06 20:07:22 UTC (rev 632)
@@ -253,10 +253,11 @@
 
 #ifndef USE_THREADED_ALARM
         fprintf(stdout, "Exit caused by Alarm(EXIT)\n");
-#ifndef ARCH_PC_WIN95
+#  ifndef ARCH_PC_WIN95
         abort();
-#endif
+#  else
         exit(0);
+#  endif
 #else
         Threaded_Alarm_Exit();
 #endif
@@ -334,8 +335,9 @@
             printf("Exit caused by Alarm(EXIT)\n");
 #ifndef ARCH_PC_WIN95
             abort();
+#else
+            exit( 0 );
 #endif
-            exit( 0 );
         }
 }
 
@@ -708,8 +710,9 @@
     fprintf(stdout, "Exit caused by Alarm(EXIT)\n");
 #ifndef ARCH_PC_WIN95
     abort();
+#else
+    exit(0);
 #endif
-    exit(0);
   }
 }