Changeset 51c97f in git

Timestamp:

Jan 11, 2012, 4:37:55 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

05f61f87ba0abf26d60c77072904adbd11f867c0

Parents:

6c98d526bf15bb5a2845bfd4fb4f54474229668c

Message:

partially seperate feResources

Files:

• Singular/ipshell.cc (modified) (1 diff)
• libpolys/resources/feResource.cc (modified) (5 diffs)
• libpolys/resources/feResource.h (modified) (1 diff)

Singular/ipshell.cc

@@ -4932 +4932 @@
 }
 
-const short MAX_SHORT = SHRT_MAX; // (1 << (sizeof(short)*8)) - 1;
+const short MAX_SHORT = 32767; // (1 << (sizeof(short)*8)) - 1;
 
 ////////////////////

libpolys/resources/feResource.cc

@@ -14 +14 @@
 
 #include "config.h"
-#include <misc/auxiliary.h>
 
 #include <findexec/omFindExec.h>
@@ -32 +31 @@
 
 #include <reporter/reporter.h>
-#if !defined(ESINGULAR) && !defined(TSINGULAR)
 #include <omalloc/omalloc.h>
-#else
-char* feResource(const char id, int warn = -1);
-char* feResource(const char* key, int warn = -1);
-#endif
+//char* feResource(const char id, int warn = -1);
+//char* feResource(const char* key, int warn = -1);
 
 // define RESOURCE_DEBUG for chattering about resource management
 // #define RESOURCE_DEBUG
 
-#if defined(MAKE_DISTRIBUTION)
-#if defined(ix86_Win) && ! defined(__CYGWIN__)
-#define SINGULAR_DEFAULT_DIR "/Singular/"S_VERSION1
-#else // unix
 #define SINGULAR_DEFAULT_DIR "/usr/local/Singular/"S_VERSION1
-#endif
-#else // ! defined(MAKE_DISTRIBUTION)
-#define SINGULAR_DEFAULT_DIR S_ROOT_DIR
-#endif // defined(MAKE_DISTRIBUTION)
 
 /*****************************************************************
@@ -110 +98 @@
   {"Path",      'p',    feResPath,  NULL,                   "%b;$PATH",             (char *)""},
 
-#ifdef ESINGULAR
   {"emacs",     'E',    feResBinary,"ESINGULAR_EMACS",      "%b/emacs",             (char *)""},
   {"xemacs",    'A',    feResBinary,"ESINGULAR_EMACS",      "%b/xemacs",            (char *)""},
@@ -116 +103 @@
   {"EmacsLoad", 'l',    feResFile,  "ESINGULAR_EMACS_LOAD", "%e/.emacs-singular",   (char *)""},
   {"EmacsDir",  'e',    feResDir,   "ESINGULAR_EMACS_DIR",  "%r/emacs",             (char *)""},
-#elif defined(TSINGULAR)
   {"SingularXterm",'M', feResBinary,"TSINGULAR_SINGULAR",   "%b/Singular",          (char *)""},
 #ifdef ix86_Win
@@ -123 +109 @@
   {"xterm",     'X',    feResBinary,"XTERM",                "%b/xterm",             (char *)""},
 #endif
-#else
   {"EmacsDir",  'e',    feResDir,   "SINGULAR_EMACS_DIR",   "%r/emacs",             (char *)""},
-#endif
   {NULL, 0, feResUndef, NULL, NULL, NULL}, // must be the last record
 };

libpolys/resources/feResource.h

@@ -1 +1 @@
 #ifndef FERESOURCE_H
 #define FERESOURCE_H
-
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-
-#include <misc/auxiliary.h>
-#include <misc/mylimits.h>
 
 #define DIR_SEP '/'