Changeset 3f61490 in git


Ignore:
Timestamp:
Apr 23, 2014, 3:30:51 PM (10 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
Children:
49f423a14c6a6f7cb193be5cdb23e0508486b81e
Parents:
ff3617ac3a622078a29cbe99db6b8e45b8bbf36b
Message:
moved line reading stuff to kernel/oswrapper part2
Files:
15 edited

Legend:

Unmodified
Added
Removed

  • Singular/febase.cc

    rff3617 r3f61490  
    1414#include <misc/options.h>
    1515
    16 #include <Singular/febase.h>
     16//#include <Singular/febase.h>
    1717
    1818#include <stdlib.h>

  • Singular/fevoices.cc

    rff3617 r3f61490  
    1313#include <misc/options.h>
    1414#include <reporter/reporter.h>
    15 #include <Singular/febase.h>
     15#include <kernel/oswrapper/feread.h>
    1616#include <Singular/fevoices.h>
    1717#include <Singular/subexpr.h>

  • Singular/grammar.cc

    rff3617 r3f61490  
    8888#include <Singular/ipid.h>
    8989#include <misc/intvec.h>
    90 #include <Singular/febase.h>
     90#include <kernel/oswrapper/feread.h>
    9191#include <Singular/fevoices.h>
    9292#include <polys/matpol.h>

  • Singular/grammar.y

    rff3617 r3f61490  
    2424#include <Singular/ipid.h>
    2525#include <misc/intvec.h>
    26 #include <Singular/febase.h>
     26#include <kernel/oswrapper/feread.h>
    2727#include <Singular/fevoices.h>
    2828#include <polys/matpol.h>

  • Singular/ipshell.cc

    rff3617 r3f61490  
    3232#include <Singular/subexpr.h>
    3333#include <Singular/fevoices.h>
    34 #include <Singular/febase.h>
     34#include <kernel/oswrapper/feread.h>
    3535#include <polys/monomials/maps.h>
    3636#include <kernel/GBEngine/syz.h>

  • Singular/links/asciiLink.cc

    rff3617 r3f61490  
    1616#include <Singular/ipid.h>
    1717#include <Singular/fevoices.h>
    18 #include <Singular/febase.h>
     18#include <kernel/oswrapper/feread.h>
    1919#include <Singular/ipshell.h>
    2020#include <Singular/links/silink.h>

  • Singular/links/ssiLink.cc

    rff3617 r3f61490  
    3535#include <Singular/lists.h>
    3636#include <Singular/blackbox.h>
    37 #include <Singular/febase.h>
     37#include <kernel/oswrapper/feread.h>
    3838#include <Singular/links/ssiLink.h>
    3939

  • Singular/misc_ip.cc

    rff3617 r3f61490  
    388388#include <Singular/timer.h>
    389389#include <resources/feResource.h>
    390 #include <Singular/febase.h>
    391 
     390#include <kernel/oswrapper/feread.h>
    392391
    393392#include "subexpr.h"

  • Singular/scanner.cc

    rff3617 r3f61490  
    570570#include <Singular/ipshell.h>
    571571#include <Singular/fevoices.h>
    572 #include <Singular/febase.h>
     572#include <kernel/oswrapper/feread.h>
    573573
    574574int feReadLine(char* b, int l);

  • Singular/scanner.ll

    rff3617 r3f61490  
    1414#include <Singular/ipshell.h>
    1515#include <Singular/fevoices.h>
    16 #include <Singular/febase.h>
     16#include <kernel/oswrapper/feread.h>
    1717
    1818int feReadLine(char* b, int l);

  • Singular/sdb.cc

    rff3617 r3f61490  
    1515#include <Singular/ipid.h>
    1616#include <Singular/fevoices.h>
    17 #include <Singular/febase.h>
     17#include <kernel/oswrapper/feread.h>
    1818#include <Singular/sdb.h>
    1919

  • Singular/tesths.cc

    rff3617 r3f61490  
    1818#include <factory/factory.h>
    1919
    20 #include <Singular/febase.h>
     20#include <kernel/oswrapper/feread.h>
    2121#include <Singular/fevoices.h>
    2222#include <Singular/timer.h>

  • kernel/Makefile.am

    rff3617 r3f61490  
    3838${builddir}/maps/libmaps.la \
    3939${builddir}/GBEngine/libGBEngine.la \
     40${builddir}/oswrapper/liboswrapper.la \
    4041${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD} \
    4142${abs_top_builddir}/libpolys/polys/libpolys.la

  • kernel/oswrapper/feread.cc

    rff3617 r3f61490  
    2020#include <misc/options.h>
    2121
    22 #include <Singular/febase.h>
     22#include <kernel/oswrapper/feread.h>
    2323
    2424#ifdef HAVE_STATIC

  • kernel/oswrapper/feread.h

    rff3617 r3f61490  
    1515
    1616/* the interface for reading: */
    17 extern char * (*fe_fgets_stdin)(const char *pr,char *s, int size);
     17extern "C" char * (*fe_fgets_stdin)(const char *pr,char *s, int size);
    1818
    1919#ifdef HAVE_DYN_RL
Note: See TracChangeset for help on using the changeset viewer.