Changeset 1e8e9c in git

Timestamp:

Apr 22, 2005, 10:36:51 AM (18 years ago)

Author:

Kai Krüger <krueger@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

511c38c15926b98d83960bcfb7caea8f43aad986

Parents:

571fd10a7ece4806fc608f75612b18cdd3879808

Message:

Kommentare bei ifdef eingefuegt


git-svn-id: file:///usr/local/Singular/svn/trunk@7864 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• Singular/cntrlc.cc (modified) (17 diffs)

Singular/cntrlc.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: cntrlc.cc,v 1.42 2004-11-09 14:54:21 Singular Exp $ */
+/* $Id: cntrlc.cc,v 1.43 2005-04-22 08:36:51 krueger Exp $ */
 /*
 * ABSTRACT - interupt handling
@@ -41 +41 @@
 
 #ifdef unix
-#ifndef hpux
-#include <unistd.h>
-#include <sys/types.h>
-
-#ifdef TIME_WITH_SYS_TIME
-# include <time.h>
-# ifdef HAVE_SYS_TIME_H
-#   include <sys/time.h>
-# endif
-#else
-# ifdef HAVE_SYS_TIME_H
-#   include <sys/time.h>
-# else
+# ifndef hpux
+#  include <unistd.h>
+#  include <sys/types.h>
+
+#  ifdef TIME_WITH_SYS_TIME
 #   include <time.h>
-# endif
-#endif
-#ifdef HAVE_SYS_TIMES_H
-#include <sys/times.h>
-#endif
-
-#define INTERACTIVE 0
-#define STACK_TRACE 1
-#ifdef CALL_GDB
+#   ifdef HAVE_SYS_TIME_H
+#     include <sys/time.h>
+#   endif
+#  else
+#   ifdef HAVE_SYS_TIME_H
+#     include <sys/time.h>
+#   else
+#     include <time.h>
+#   endif
+#  endif
+#  ifdef HAVE_SYS_TIMES_H
+#   include <sys/times.h>
+#  endif
+
+#  define INTERACTIVE 0
+#  define STACK_TRACE 1
+#  ifdef CALL_GDB
 static void debug (int);
 static void debug_stop (char **);
-#endif
-#ifndef __OPTIMIZE__
+#  endif
+#  ifndef __OPTIMIZE__
 static void stack_trace (char **);
 static void stack_trace_sigchld (int);
-#endif
-#endif
-#endif
+#  endif
+# endif /* !hpux */
+#endif  /* unix */
 
 /* data */
@@ -85 +85 @@
 #ifndef MSDOS
 /* signals are not implemented in DJGCC */
-#ifndef macintosh
+# ifndef macintosh
 /* signals are not right implemented in macintosh */
 void sigint_handler(int sig);
-#endif
+# endif /* !macintosh */
 #endif
 
 #if defined(linux) && defined(__i386__)
-#if defined(HAVE_SIGCONTEXT) || defined(HAVE_ASM_SIGCONTEXT_H)
-#include <asm/sigcontext.h>
-#else
+# if defined(HAVE_SIGCONTEXT) || defined(HAVE_ASM_SIGCONTEXT_H)
+#  include <asm/sigcontext.h>
+# else
 struct sigcontext_struct {
         unsigned short gs, __gsh;
@@ -119 +119 @@
         unsigned long cr2;
 };
-#endif
+# endif
 typedef struct sigcontext_struct sigcontext;
 
@@ -134 +134 @@
                    (int)s.eip,(int)s.cr2,siRandomStart);
   }
-#ifdef __OPTIMIZE__
+# ifdef __OPTIMIZE__
   if(si_restart<3)
   {
@@ -142 +142 @@
     longjmp(si_start_jmpbuf,1);
   }
-#endif
-#ifdef CALL_GDB
+# endif
+# ifdef CALL_GDB
   if (sig!=SIGINT) debug(INTERACTIVE);
-#endif
+# endif
   exit(0);
 }
@@ -158 +158 @@
 }
 
-#ifdef PAGE_TEST
-#ifndef PAGE_INTERRUPT_TIME
-#define PAGE_INTERRUPT_TIME 1
-#endif
+# ifdef PAGE_TEST
+#  ifndef PAGE_INTERRUPT_TIME
+#   define PAGE_INTERRUPT_TIME 1
+#  endif
 void sig11_handler(int sig, sigcontext s)
 {
@@ -191 +191 @@
   signal(SIGVTALRM,(si_hdl_typ)sigalarm_handler);
 }
-#endif
+# endif /* PAGE_TEST */
 
 /*2
@@ -199 +199 @@
 {
 /*4 signal handler: linux*/
-#ifdef PAGE_TEST
+# ifdef PAGE_TEST
   signal(SIGSEGV,(si_hdl_typ)sig11_handler);
   struct itimerval t,o;
@@ -209 +209 @@
   setitimer(ITIMER_VIRTUAL,&t,&o);
   signal(SIGVTALRM,(si_hdl_typ)sigalarm_handler);
-#else
+# else /* PAGE_TEST */
   if (SIG_ERR==signal(SIGSEGV,(si_hdl_typ)sigsegv_handler))
   {
     PrintS("cannot set signal handler for SEGV\n");
   }
-#endif
+# endif /* PAGE_TEST */
   if (SIG_ERR==signal(SIGFPE, (si_hdl_typ)sigsegv_handler))
   {
@@ -235 +235 @@
 }
 
-#else
-#ifdef SPARC_SUNOS_4
+#else /* linux && __i386__ */
+# ifdef SPARC_SUNOS_4
 /*2
 * signal handler for run time errors, sparc sunos 4 version
@@ -250 +250 @@
                    (int)addr,siRandomStart);
   }
-#ifdef __OPTIMIZE__
+#  ifdef __OPTIMIZE__
   if(si_restart<3)
   {
@@ -258 +258 @@
     longjmp(si_start_jmpbuf,1);
   }
-#endif
-#ifdef CALL_GDB
+#  endif /* __OPTIMIZE__ */
+#  ifdef CALL_GDB
   if (sig!=SIGINT) debug(STACK_TRACE);
-#endif
+#  endif /* CALL_GDB */
   exit(0);
 }
@@ -279 +279 @@
   signal(SIGCHLD, (void (*)(int))SIG_IGN);
 }
-#else
+# else /* SPARC_SUNOS_4 */
 
 /*2
 * signal handler for run time errors, general version
 */
-#ifndef macintosh
+# ifndef macintosh
 void sigsegv_handler(int sig)
 {
@@ -295 +295 @@
                    siRandomStart);
   }
-#ifdef __OPTIMIZE__
+#  ifdef __OPTIMIZE__
   if(si_restart<3)
   {
@@ -303 +303 @@
     longjmp(si_start_jmpbuf,1);
   }
-#endif
-#ifdef unix
-#ifndef hpux
+#  endif /* __OPTIMIZE__ */
+#  ifdef unix
+#   ifndef hpux
 /* debug(..) does not work under HPUX (because ptrace does not work..) */
-#ifdef CALL_GDB
-#ifndef MSDOS
+#    ifdef CALL_GDB
+#     ifndef MSDOS
   if (sig!=SIGINT) debug(STACK_TRACE);
-#endif
-#endif
-#endif
-#endif
+#     endif /* MSDOS */
+#    endif /* CALL_GDB */
+#   endif /* !hpux */
+#  endif /* unix */
   exit(0);
 }
-#endif
+# endif /* !macintosh */
 
 /*2
@@ -323 +323 @@
 void init_signals()
 {
-#ifndef MSDOS
+# ifndef MSDOS
 /* signals are not implemented in DJGCC */
-#ifndef macintosh
+#  ifndef macintosh
 /* signals are temporaliy removed for macs. */
 /*4 signal handler:*/
   signal(SIGSEGV,(void (*) (int))sigsegv_handler);
-#ifdef SIGBUS
+#   ifdef SIGBUS
   signal(SIGBUS, sigsegv_handler);
-#endif
-#ifdef SIGFPE
+#   endif
+#   ifdef SIGFPE
   signal(SIGFPE, sigsegv_handler);
-#endif
-#ifdef SIGILL
+#   endif
+#   ifdef SIGILL
   signal(SIGILL, sigsegv_handler);
-#endif
-#ifdef SIGIOT
+#   endif
+#   ifdef SIGIOT
   signal(SIGIOT, sigsegv_handler);
-#endif
-#ifdef SIGXCPU
+#   endif
+#   ifdef SIGXCPU
   signal(SIGXCPU, (void (*)(int))SIG_IGN);
-#endif
+#   endif
   signal(SIGINT ,sigint_handler);
   signal(SIGCHLD, (void (*)(int))SIG_IGN);
-#endif
-#endif
+#  endif
+# endif
 }
 #endif