Changeset 9d53d0 in git


Ignore:
Timestamp:
Jul 19, 2011, 10:09:01 AM (13 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
Children:
cab375d56d605292e44b155cb07f350026731a7c
Parents:
7d0225e5a511b7f22d8c67004515cac681735586
git-author:
Hans Schoenemann <hannes@mathematik.uni-kl.de>2011-07-19 10:09:01+02:00
git-committer:
Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 12:39:56+01:00
Message:
fix includes for C-files
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • factory/cf_gmp.h

    r7d0225 r9d53d0  
    33
    44
    5 #define __cplusplus_backup __cplusplus
    6 #undef __cplusplus
    7 extern "C" {
    8 #include <gmp.h>
    9 }
    10 #define __cplusplus __cplusplus_backup
     5#ifdef _cplusplus
     6  #define __cplusplus_backup __cplusplus
     7  #undef __cplusplus
     8  extern "C" {
     9  #include <gmp.h>
     10  }
     11  #define __cplusplus __cplusplus_backup
     12#else
     13  #include <gmp.h>
     14#endif
    1115
    1216

  • kernel/febase.h

    r7d0225 r9d53d0  
    175175
    176176}
    177 #endif
    178177const  char * VoiceName();
    179178void    VoiceBackTrack();
    … …  
    189188
    190189#endif
     190#endif
    191191 

  • kernel/structs.h

    r7d0225 r9d53d0  
    1111/* for omBin */
    1212#include <omalloc/omalloc.h>
     13#include <misc/auxiliary.h>
    1314#ifdef HAVE_RINGS
    1415#include <kernel/si_gmp.h>
    1516#endif
    1617
     18extern int dummy;
    1719
    1820/* standard types */
    … …  
    2123typedef mpz_ptr int_number;
    2224#endif
    23 #if (SIZEOF_LONG == 8)
    24 typedef int BOOLEAN;
    25 /* testet on x86_64, gcc 3.4.6: 2 % */
    26 /* testet on IA64, gcc 3.4.6: 1 % */
    27 #else
    28 /* testet on athlon, gcc 2.95.4: 1 % */
    29 typedef short BOOLEAN;
    30 #endif
    3125
    32 typedef void * ADDRESS;
    3326#define BITSET  unsigned int
    3427

  • libpolys/resources/feResource.h

    r7d0225 r9d53d0  
    1616#endif
    1717
    18 
     18#ifdef _cplusplus
    1919/*****************************************************************
    2020 *
    … …  
    4444void feStringAppendResources(int warn = -1);
    4545
    46 
     46#endif
     47/* end ifdef _cplusplus */
    4748
    4849
    4950const char fePathSep =
    50 // not really cygwin, applies to all windows systems:
     51/* not really cygwin, applies to all windows systems:*/
    5152#if (defined(CYGWIN) || defined(ix86_Win))
    5253                ';'
Note: See TracChangeset for help on using the changeset viewer.