Changeset 51c97f in git


Ignore:
Timestamp:
Jan 11, 2012, 4:37:55 PM (12 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')
Children:
05f61f87ba0abf26d60c77072904adbd11f867c0
Parents:
6c98d526bf15bb5a2845bfd4fb4f54474229668c
Message:
partially seperate feResources
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • Singular/ipshell.cc

    r6c98d52 r51c97f  
    49324932}
    49334933
    4934 const short MAX_SHORT = SHRT_MAX; // (1 << (sizeof(short)*8)) - 1;
     4934const short MAX_SHORT = 32767; // (1 << (sizeof(short)*8)) - 1;
    49354935
    49364936////////////////////
  • libpolys/resources/feResource.cc

    r6c98d52 r51c97f  
    1414
    1515#include "config.h"
    16 #include <misc/auxiliary.h>
    1716
    1817#include <findexec/omFindExec.h>
     
    3231
    3332#include <reporter/reporter.h>
    34 #if !defined(ESINGULAR) && !defined(TSINGULAR)
    3533#include <omalloc/omalloc.h>
    36 #else
    37 char* feResource(const char id, int warn = -1);
    38 char* feResource(const char* key, int warn = -1);
    39 #endif
     34//char* feResource(const char id, int warn = -1);
     35//char* feResource(const char* key, int warn = -1);
    4036
    4137// define RESOURCE_DEBUG for chattering about resource management
    4238// #define RESOURCE_DEBUG
    4339
    44 #if defined(MAKE_DISTRIBUTION)
    45 #if defined(ix86_Win) && ! defined(__CYGWIN__)
    46 #define SINGULAR_DEFAULT_DIR "/Singular/"S_VERSION1
    47 #else // unix
    4840#define SINGULAR_DEFAULT_DIR "/usr/local/Singular/"S_VERSION1
    49 #endif
    50 #else // ! defined(MAKE_DISTRIBUTION)
    51 #define SINGULAR_DEFAULT_DIR S_ROOT_DIR
    52 #endif // defined(MAKE_DISTRIBUTION)
    5341
    5442/*****************************************************************
     
    11098  {"Path",      'p',    feResPath,  NULL,                   "%b;$PATH",             (char *)""},
    11199
    112 #ifdef ESINGULAR
    113100  {"emacs",     'E',    feResBinary,"ESINGULAR_EMACS",      "%b/emacs",             (char *)""},
    114101  {"xemacs",    'A',    feResBinary,"ESINGULAR_EMACS",      "%b/xemacs",            (char *)""},
     
    116103  {"EmacsLoad", 'l',    feResFile,  "ESINGULAR_EMACS_LOAD", "%e/.emacs-singular",   (char *)""},
    117104  {"EmacsDir",  'e',    feResDir,   "ESINGULAR_EMACS_DIR",  "%r/emacs",             (char *)""},
    118 #elif defined(TSINGULAR)
    119105  {"SingularXterm",'M', feResBinary,"TSINGULAR_SINGULAR",   "%b/Singular",          (char *)""},
    120106#ifdef ix86_Win
     
    123109  {"xterm",     'X',    feResBinary,"XTERM",                "%b/xterm",             (char *)""},
    124110#endif
    125 #else
    126111  {"EmacsDir",  'e',    feResDir,   "SINGULAR_EMACS_DIR",   "%r/emacs",             (char *)""},
    127 #endif
    128112  {NULL, 0, feResUndef, NULL, NULL, NULL}, // must be the last record
    129113};
  • libpolys/resources/feResource.h

    r6c98d52 r51c97f  
    11#ifndef FERESOURCE_H
    22#define FERESOURCE_H
    3 
    4 #ifdef HAVE_SYS_PARAM_H
    5 #include <sys/param.h>
    6 #endif
    7 
    8 #include <misc/auxiliary.h>
    9 #include <misc/mylimits.h>
    103
    114#define DIR_SEP '/'
Note: See TracChangeset for help on using the changeset viewer.