Changeset 88479ff in git


Ignore:
Timestamp:
Aug 10, 2011, 7:15:23 PM (13 years ago)
Author:
Burcin Erocal <burcin@…>
Branches:
(u'spielwiese', '52dcfddee5ec87d404d5e0fb44f2d627608208f1')
Children:
b1ca9992c1a4e67c4f6161015c9bb3efd24c96f4
Parents:
3d916556bc99e6cc5dda30a490bf9d639de87c93
git-author:
Burcin Erocal <burcin@erocal.org>2011-08-10 19:15:23+02:00
git-committer:
Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 13:19:13+01:00
Message:
Change includes in Singular/tesths.cc to work around cstdio/stdio.h conflict.
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • Singular/tesths.cc

    r3d9165 r88479ff  
    88*/
    99
     10#include <misc/options.h>
     11#include <misc/auxiliary.h>
     12#ifdef HAVE_FACTORY
     13#define SI_DONT_HAVE_GLOBAL_VARS
     14#include <factory/factory.h>
     15#endif
     16
     17#include <kernel/mod2.h>
     18#include <Singular/tok.h>
    1019#include <unistd.h>
    1120#include <string.h>
    12 #include <stdio.h>
    1321#include <stddef.h>
    1422#include <stdlib.h>
    1523#include <time.h>
    1624#include <errno.h>
    17 #include <kernel/mod2.h>
    18 #include <Singular/tok.h>
    19 #include <misc/options.h>
     25
    2026#include <Singular/ipshell.h>
    2127#include <kernel/febase.h>
     
    3541#include <Singular/pyobject_setup.h>
    3642#include <omalloc/omalloc.h>
     43#include <kernel/mmalloc.h>
    3744
    3845#ifdef HAVE_FANS
     
    4148#endif
    4249
    43 #ifdef HAVE_FACTORY
    44 #define SI_DONT_HAVE_GLOBAL_VARS
    45 #include <factory/factory.h>
    46 #endif
    4750
    4851extern int siInit(char *);
  • kernel/mod2.h

    r3d9165 r88479ff  
    1616#define SINGULAR_SUB_VERSION 0
    1717#define S_ROOT_DIR ""
     18
     19/* Define version date as a string - temporarily*/
     20#define S_VERSION2 ""
    1821
    1922/*******************************************************************
Note: See TracChangeset for help on using the changeset viewer.