Changeset 88479ff in git

Timestamp:

Aug 10, 2011, 7:15:23 PM (12 years ago)

Author:

Burcin Erocal <burcin@…>

Branches:

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

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:

• Singular/tesths.cc (modified) (3 diffs)
• kernel/mod2.h (modified) (1 diff)

Singular/tesths.cc

@@ -8 +8 @@
 */
 
+#include <misc/options.h>
+#include <misc/auxiliary.h>
+#ifdef HAVE_FACTORY
+#define SI_DONT_HAVE_GLOBAL_VARS
+#include <factory/factory.h>
+#endif
+
+#include <kernel/mod2.h>
+#include <Singular/tok.h>
 #include <unistd.h>
 #include <string.h>
-#include <stdio.h>
 #include <stddef.h>
 #include <stdlib.h>
 #include <time.h>
 #include <errno.h>
-#include <kernel/mod2.h>
-#include <Singular/tok.h>
-#include <misc/options.h>
+
 #include <Singular/ipshell.h>
 #include <kernel/febase.h>
@@ -35 +41 @@
 #include <Singular/pyobject_setup.h>
 #include <omalloc/omalloc.h>
+#include <kernel/mmalloc.h>
 
 #ifdef HAVE_FANS
@@ -41 +48 @@
 #endif
 
-#ifdef HAVE_FACTORY
-#define SI_DONT_HAVE_GLOBAL_VARS
-#include <factory/factory.h>
-#endif
 
 extern int siInit(char *);

kernel/mod2.h

@@ -16 +16 @@
 #define SINGULAR_SUB_VERSION 0
 #define S_ROOT_DIR ""
+
+/* Define version date as a string - temporarily*/
+#define S_VERSION2 ""
 
 /*******************************************************************