Changeset 206e202 in git


Ignore:
Timestamp:
Jan 3, 2018, 12:45:11 PM (5 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a657104b677b4c461d018cbf3204d72d34ad66a9')
Children:
994ae3afb31cdf5253ac172b57cac2c2f2fc8cb0
Parents:
fcbac7b9322bbd4185f67888844e361a5d59b607
Message:
fix: gcc 6 does not define "unix" on linux
Location:
Singular
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • Singular/cntrlc.cc

    rfcbac7b r206e202  
    3636#endif
    3737
    38 #if defined(unix)
    3938 #include <unistd.h>
    4039 #include <sys/types.h>
     
    6665   static void stack_trace (char *const*args);
    6766 #endif
    68 #endif
    6967
    7068si_link pipeLastLink=NULL;
     
    302300  }
    303301  #endif /* __OPTIMIZE__ */
    304   #if defined(unix)
    305302  #ifdef CALL_GDB
    306303  if (sig!=SIGINT) debug(STACK_TRACE);
    307304  #endif /* CALL_GDB */
    308   #endif /* unix */
    309305  exit(0);
    310306}
     
    410406//}
    411407
    412 #ifdef unix
    413408#  ifndef __OPTIMIZE__
    414409volatile int si_stop_stack_trace_x;
     
    565560
    566561#  endif /* !__OPTIMIZE__ */
    567 #endif /* unix */
    568562
    569563/*2
  • Singular/extra.cc

    rfcbac7b r206e202  
    278278    else
    279279/*==================== alarm ==================================*/
    280   #ifdef unix
    281280      if(strcmp(sys_cmd,"alarm")==0)
    282281      {
     
    296295      }
    297296      else
    298   #endif
    299297/*==================== cpu ==================================*/
    300298    if(strcmp(sys_cmd,"cpu")==0)
  • Singular/libparse.h

    rfcbac7b r206e202  
    9898
    9999#  ifdef STANDALONE_PARSER
    100 #ifndef unix
    101 extern FILE* myfopen(char *path, char *mode);
    102 extern size_t myfread(void *ptr, size_t size, size_t nmemb, FILE *stream);
    103 #else
    104100#define myfopen fopen
    105101#define myfread fread
    106 #endif
    107102#  endif
    108103
Note: See TracChangeset for help on using the changeset viewer.