Changeset ef6f95 in git


Ignore:
Timestamp:
Aug 25, 2011, 6:48:28 PM (12 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'spielwiese', 'f6c3dc58b0df4bd712574325fe76d0626174ad97')
Children:
d663f223df8d3d18b22216b8d1384e28c7e8f6aa
Parents:
8aa03b2badd649c49b82f40c89165d11cee9fc4c
git-author:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-08-25 18:48:28+02:00
git-committer:
Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 16:12:29+01:00
Message:
CHG: libSingular* needs LIBSINGULAR define
Location:
Singular
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • Singular/cntrlc.cc

    r8aa03b ref6f95  
    1111#define _XOPEN_SOURCE_EXTENDED
    1212#endif /* MP3-Y2 0.022UF */
     13
    1314#include <stdio.h>
    1415#include <stddef.h>
    … …  
    1819#include <sys/types.h>
    1920#include <sys/wait.h>
     21
    2022#include <kernel/mod2.h>
    2123#include <omalloc/omalloc.h>

  • Singular/libsingular.h

    r8aa03b ref6f95  
    1 #ifndef SINGULAR__H
    2 #define SINGULAR__H
     1#ifndef LIBSINGULAR__H
     2#define LIBSINGULAR__H
    33
    4 #include <math.h>
     4#include <math.h> // Why this?
     5/*
     6// TODO: correct these includes!!!
    57#include <singular/mod2.h>
    68#include <singular/structs.h>
    … …  
    2931#include <singular/attrib.h>
    3032#include <singular/options.h>
     33*/
    3134
    3235void siInit(char *);
    3336
    3437/* we need this function in Sage*/
    35 number nr2mMapZp(number from);
     38number nr2mMapZp(number from); // TODO: replace with something else...
    3639
    37 #endif //SINGULAR__H
    3840
     41#endif // #ifndef LIBSINGULAR__H
     42

  • Singular/makefile

    r8aa03b ref6f95  
    5353CXXTEMPLFLAGS   = -fno-implicit-templates --no-exceptions
    5454CPPFLAGS        = -I${srcdir} -I..  -I${includedir} ${LIBPOLYS_INCLUDES}  ${PYTHON_INCLUDES}
    55 DEFS            = -DNDEBUG -DOM_NDEBUG  -DHAVE_SINGULAR
     55DEFS            = -DNDEBUG -DOM_NDEBUG -DLIBSINGULAR
    5656LDFLAGS         = -L${srcdir}/lib
    5757LD_DYN_FLAGS    = -ldl -rdynamic
    … …  
    300300CCM             = gcc -MM -MG -DGENERATE_DEPEND
    301301
    302 DEFSG           =  -DHAVE_SINGULAR
     302DEFSG           =   -DLIBSINGULAR
    303303
    304304CFLAGSG         = -Wall ${PIPE} ${LIBPOLYS_CFLAGS} ${PYTHON_CFLAGS}
Note: See TracChangeset for help on using the changeset viewer.