Ignore:
Timestamp:
Jun 2, 2022, 3:11:21 PM (3 years ago)
Author:
caparsons <caparson@…>
Branches:
ADT, ast-experimental, master, pthread-emulation, qualifiedEnum
Children:
ced5e2a
Parents:
015925a (diff), fc134a48 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:
1 edited

Legend:

Unmodified
Added
Removed
  • tests/include/includes.cfa

    r015925a re5d9274  
    1010// Created On       : Wed May 27 17:56:53 2015
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Tue May 10 16:36:44 2022
    13 // Update Count     : 776
     12// Last Modified On : Sun May 22 08:27:20 2022
     13// Update Count     : 779
    1414//
    1515
     
    4747#endif
    4848#include <execinfo.h>
    49 #include <expat.h>
     49#if __has_include( "expat.h" )
     50#include <expat.h>                                                                              // may not be installed
    5051#include <expat_external.h>
     52#endif
    5153#include <fcntl.h>
    5254#include <features.h>
     
    7981//#include <link.h>                                                                             // CFA bug #240 nested anonymous enum fails
    8082#include <locale.h>
    81 #include <ltdl.h>
     83#if __has_include( "ltdl.h" )
     84#include <ltdl.h>                                                                               // may not be installed
     85#endif
    8286//#include <malloc.h>                                                                   // cannot include in extern "C" because of CFA #include_next
    8387#include <math.h>
Note: See TracChangeset for help on using the changeset viewer.