Changeset 83192d in git


Ignore:
Timestamp:
Jun 21, 2013, 6:46:15 PM (11 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
Children:
f88e07c79359c9680861c6db7a48478e2119bc60
Parents:
fe2e01ff5d2ee7a642d4a93d187fda61a3204007
git-author:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2013-06-21 18:46:15+02:00
git-committer:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2013-07-09 22:24:33+02:00
Message:
Fixing the including of "config.h"-files before any other headers + include reordering...

fix: also syzextra
Files:
20 edited

Legend:

Unmodified
Added
Removed

  • Singular/countedref.cc

    rfe2e01 r83192d  
    1616//*****************************************************************************
    1717
     18#ifdef HAVE_CONFIG_H
     19#include "config.h"
     20#endif /* HAVE_CONFIG_H */
    1821
    1922#include <kernel/mod2.h>
     23
    2024#include "ipid.h"
    2125

  • Singular/iplib.cc

    rfe2e01 r83192d  
    66*/
    77
    8 //#include <stdlib.h>
    9 #include <stdio.h>
    10 #include <string.h>
    11 #include <ctype.h>
    12 #include <sys/stat.h>
    13 
    148#ifdef HAVE_CONFIG_H
    159#include "config.h"
    1610#endif /* HAVE_CONFIG_H */
     11
    1712#include <kernel/mod2.h>
     13
    1814#include <Singular/tok.h>
    1915#include <misc/options.h>
    … …  
    2521#include <Singular/ipshell.h>
    2622#include <Singular/lists.h>
     23
     24//#include <stdlib.h>
     25#include <stdio.h>
     26#include <string.h>
     27#include <ctype.h>
     28#include <sys/stat.h>
     29
    2730
    2831#if SIZEOF_LONG == 8

  • Singular/links/semaphore.c

    rfe2e01 r83192d  
     1#ifdef HAVE_CONFIG_H
     2#include "config.h"
     3#endif /* HAVE_CONFIG_H */
     4
     5#include <kernel/mod2.h>
     6
     7#ifdef HAVE_SIMPLEIPC
     8
     9# include "simpleipc.h"
     10
     11#include <Singular/si_signals.h>
     12
    113#include <semaphore.h>
    214#include <fcntl.h>
    … …  
    618#include <stdlib.h>
    719
    8 #include <kernel/mod2.h>
    9 #include <Singular/si_signals.h>
    10 
    11 #ifdef HAVE_SIMPLEIPC
    12 #include "simpleipc.h"
    1320
    1421// Not yet implemented: SYSV IPC Semaphores

  • Singular/mod_lib.cc

    rfe2e01 r83192d  
     1#ifdef HAVE_CONFIG_H
     2#include "config.h"
     3#endif /* HAVE_CONFIG_H */
     4
     5#include <kernel/mod2.h>
     6
     7#include <resources/feFopen.h>
     8#include <polys/mod_raw.h>
     9
     10#include <Singular/mod_lib.h>
     11
    112#include <stdio.h>
    213#include <string.h>
    … …  
    516#include <errno.h>
    617
    7 #include <kernel/mod2.h>
    8 #include <resources/feFopen.h>
    9 #include <polys/mod_raw.h>
    10 #include <Singular/mod_lib.h>
    1118
    1219#define SI_BUILTIN_LIBSTR(name) (char*) #name ".so",

  • Singular/mod_lib.h

    rfe2e01 r83192d  
    22#define MOD_LIB_H
    33
    4 #include <config.h>         /* for EMBED_PYTHON */
     4// #include <config.h>         /* for EMBED_PYTHON */
     5
    56#include <polys/mod_raw.h>  /* for lib_types */
    67

  • Singular/pyobject.cc

    rfe2e01 r83192d  
    1616#include "config.h"
    1717#endif /* HAVE_CONFIG_H */
     18
    1819#include <kernel/mod2.h>
    19   //#include <misc/auxiliary.h>
    20   //#include "newstruct.h"
    21 
     20
     21//#include <misc/auxiliary.h>
     22//#include "newstruct.h"
     23
     24#include <misc/auxiliary.h>
     25
     26#include <omalloc/omalloc.h>
     27
     28#include <kernel/febase.h>
     29#include <misc/intvec.h>
     30
     31#include <polys/mod_raw.h>
    2232
    2333#include <Singular/ipid.h>
    … …  
    2838#include <Singular/newstruct.h>
    2939
    30 
    31 #include <misc/auxiliary.h>
    32 
    33 #include <omalloc/omalloc.h>
    34 
    35 #include <kernel/febase.h>
    36 #include <misc/intvec.h>
    3740
    3841#include "subexpr.h"
    … …  
    720723     (char*)#name, FALSE, name);
    721724
    722 int pyobject_mod_init(SModulFunctions* psModulFunctions)
     725int SI_MOD_INIT(pyobject)(SModulFunctions* psModulFunctions)
    723726{
    724727  int tok = -1;
    … …  
    751754  int mod_init(SModulFunctions* psModulFunctions)
    752755  {
    753     return pyobject_mod_init(psModulFunctions);
     756    return SI_MOD_INIT(pyobject)(psModulFunctions);
    754757  }
    755758}

  • Singular/pyobject_setup.cc

    rfe2e01 r83192d  
    1616#include "config.h"
    1717#endif /* HAVE_CONFIG_H */
     18
    1819#include <kernel/mod2.h>
    1920#include <kernel/febase.h>
    … …  
    2122#include <Singular/ipshell.h>
    2223
    23 #ifdef EMBED_PYTHON
    24 #include "pyobject.cc"
    25 #endif
     24//#ifdef EMBED_PYTHON
     25//#include "pyobject.cc"
     26//#endif
    2627
    2728static BOOLEAN pyobject_load()

  • dyn_modules/bigintm/bigintm.cc

    rfe2e01 r83192d  
     1#ifdef HAVE_CONFIG_H
     2#include "config.h"
     3#endif /* HAVE_CONFIG_H */
     4
    15#include <kernel/mod2.h>
    26

  • dyn_modules/bigintm/mod_main.cc

    rfe2e01 r83192d  
    22 * Developer's BB tests
    33 */
     4
     5#ifdef HAVE_CONFIG_H
     6#include "config.h"
     7#endif /* HAVE_CONFIG_H */
    48
    59#include <kernel/mod2.h>

  • dyn_modules/syzextra/DebugPrint.cc

    rfe2e01 r83192d  
    1414 **/
    1515/*****************************************************************************/
     16
     17#ifdef HAVE_CONFIG_H
     18#include "config.h"
     19#endif /* HAVE_CONFIG_H */
    1620
    1721// include header file

  • dyn_modules/syzextra/mod_main.cc

    rfe2e01 r83192d  
     1#ifdef HAVE_CONFIG_H
     2#include "config.h"
     3#endif /* HAVE_CONFIG_H */
     4
    15#include <kernel/mod2.h>
    26
    … …  
    3135#include "DebugPrint.h"
    3236#include "myNF.h"
     37
     38
     39#include <Singular/mod_lib.h>
    3340
    3441
    … …  
    9981005END_NAMESPACE
    9991006
    1000 extern "C"
    1001 {
    1002 
    1003 int mod_init(SModulFunctions* psModulFunctions)
     1007
     1008int SI_MOD_INIT(syzextra)(SModulFunctions* psModulFunctions)
    10041009{
    10051010#define ADD0(A,B,C,D,E) A(B, (char*)C, D, E)
    … …  
    10361041  return 0;
    10371042}
    1038 }
     1043
     1044#ifndef EMBED_PYTHON
     1045extern "C" {
     1046int mod_init(SModulFunctions* psModulFunctions)
     1047{
     1048  return SI_MOD_INIT(syzextra)(psModulFunctions);
     1049}
     1050}
     1051#endif

  • dyn_modules/syzextra/myNF.cc

    rfe2e01 r83192d  
    1515/*****************************************************************************/
    1616
     17#ifdef HAVE_CONFIG_H
     18#include "config.h"
     19#endif /* HAVE_CONFIG_H */
     20
    1721// include header file
    1822#include <kernel/mod2.h>

  • kernel/mod2.h

    rfe2e01 r83192d  
    99#ifndef MOD2_H
    1010#define MOD2_H
     11
     12#ifndef CXXFLAGS
     13#error "PLEASE '#include \"config.h\"' using before mod2.h!!!"
     14#endif
     15
    1116
    1217#include <misc/auxiliary.h>

  • kernel/syz2.cc

    rfe2e01 r83192d  
    99#include "config.h"
    1010#endif /* HAVE_CONFIG_H */
     11
    1112#include "mod2.h"
    1213

  • kernel/timer.cc

    rfe2e01 r83192d  
    66*  ABSTRACT - get the computing time
    77*/
     8#ifdef HAVE_CONFIG_H
     9#include "config.h"
     10#endif /* HAVE_CONFIG_H */
     11
     12#include <kernel/mod2.h>
     13
    814#include <sys/resource.h>
    915#include <time.h>
    1016#include <sys/time.h>
    1117#include <unistd.h>
    12 
    13 #ifdef HAVE_CONFIG_H
    14 #include "config.h"
    15 #endif /* HAVE_CONFIG_H */
    16 #include <kernel/mod2.h>
    1718
    1819int        timerv = 0;

  • libpolys/coeffs/bigintmat.cc

    rfe2e01 r83192d  
    55 * ABSTRACT: class bigintmat: matrizes of big integers
    66 */
     7
     8#ifdef HAVE_CONFIG_H
     9#include "config.h"
     10#endif /* HAVE_CONFIG_H */
     11
    712#include "bigintmat.h"
    813

  • libpolys/misc/int64vec.cc

    rfe2e01 r83192d  
    55* ABSTRACT: class int64vec: lists/vectors of int64
    66*/
     7
     8#ifdef HAVE_CONFIG_H
     9#include "config.h"
     10#endif /* HAVE_CONFIG_H */
     11
     12
    713#include <misc/int64vec.h>
    814#include <misc/intvec.h>

  • libpolys/polys/PolyEnumerator.cc

    rfe2e01 r83192d  
     1#ifdef HAVE_CONFIG_H
     2#include "config.h"
     3#endif /* HAVE_CONFIG_H */
     4
     5#include <misc/auxiliary.h>
     6
    17#include "PolyEnumerator.h"
    28

  • libpolys/polys/weight.cc

    rfe2e01 r83192d  
    77*/
    88
     9#ifdef HAVE_CONFIG_H
     10#include "config.h"
     11#endif /* HAVE_CONFIG_H */
     12
     13#include <misc/auxiliary.h>
     14
     15#include <omalloc/omalloc.h>
     16
     17#include <misc/options.h>
     18#include <misc/intvec.h>
     19
     20#include <polys/monomials/ring.h>
     21#include <polys/monomials/p_polys.h>
     22
     23#include <polys/weight.h>
     24
    925#include <math.h>
    10 //#include <kernel/mod2.h>
    11 #include <omalloc/omalloc.h>
    12 #include <misc/options.h>
    13 #include <polys/monomials/p_polys.h>
    14 #include <misc/intvec.h>
    15 //#include <kernel/febase.h>
    16 //#include <kernel/ideals.h>
    17 #include <polys/monomials/ring.h>
    18 #include <polys/weight.h>
    1926
    2027/*0 implementation*/

  • libpolys/polys/weight0.c

    rfe2e01 r83192d  
    77*/
    88
     9#ifdef HAVE_CONFIG_H
     10#include "config.h"
     11#endif /* HAVE_CONFIG_H */
     12
     13#include <misc/auxiliary.h>
     14#include <omalloc/omalloc.h>
     15
    916#include <math.h>
    1017#include <string.h>
    11 #include <misc/auxiliary.h>
    12 #include <omalloc/omalloc.h>
    1318
    1419double wFunctionalMora(int *degw, int *lpol, int npol,
Note: See TracChangeset for help on using the changeset viewer.