Changeset e28fc4 in git


Ignore:
Timestamp:
Sep 26, 2011, 6:36:49 PM (11 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')
Children:
a8b8d033cc77dede263d1c2b1ce1c838cc69ce74
Parents:
79c0351b31771af55f2815d71696269d7274e5c3
git-author:
Hans Schoenemann <hannes@mathematik.uni-kl.de>2011-09-26 18:36:49+02:00
git-committer:
Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 16:13:34+01:00
Message:
fix: multiple definitions of feOptStruct
Location:
Singular
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • Singular/feOpt.cc

    r79c035 re28fc4  
    1717#endif
    1818
     19#define FE_OPT_STRUCTURE
    1920#include "feOpt.h"
    20 #include "feOptTab.h"
    2121
    2222#if !defined(GENERATE_OPTION_INDEX) && !defined(ESINGULAR) && !defined(TSINGULAR)

  • Singular/feOpt.h

    r79c035 re28fc4  
    1010
    1111#include <kernel/fegetopt.h>
     12
    1213#include <Singular/feOptTab.h>
    1314
    1415extern const char SHORT_OPTS_STRING[];
    15 #define LONG_OPTION_RETURN 13
    1616
    1717/* specifies format of options */

  • Singular/feOptGen.cc

    r79c035 re28fc4  
    1111
    1212#include <kernel/mod2.h>
     13
     14#define FE_OPT_STRUCTURE
    1315
    1416#include "feOptGen.h"

  • Singular/feOptGen.h

    r79c035 re28fc4  
    1212
    1313extern const char SHORT_OPTS_STRING[];
    14 #define LONG_OPTION_RETURN 13
    1514
    1615#include <Singular/FeOptTab.h>

  • Singular/feOptTab.h

    r79c035 re28fc4  
    11#ifndef FE_OPT_TAB_H
    22#define FE_OPT_TAB_H
     3
     4#define LONG_OPTION_RETURN 13
     5
    36// Define here which cmd-line options are recognized
     7#ifndef FE_OPT_STRUCTURE
     8extern struct fe_option feOptSpec[];
     9#else
    410struct fe_option feOptSpec[] =
    511{
    … …  
    156162
    157163#endif
     164#endif
Note: See TracChangeset for help on using the changeset viewer.