Ignore:
Timestamp:
Mar 15, 2021, 2:22:39 PM (7 months ago)
Author:
Peter A. Buhr <pabuhr@…>
Branches:
arm-eh, jacob/cs343-translation, master, new-ast-unique-expr
Children:
9528767
Parents:
79e23836 (diff), e5e5af9 (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

    r79e23836 r34d62a7  
    55// file "LICENCE" distributed with Cforall.
    66//
    7 // includes.cfa -- 
     7// includes.cfa --
    88//
    99// Author           : Peter A. Buhr
    1010// Created On       : Wed May 27 17:56:53 2015
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Sun Mar 14 10:18:26 2021
    13 // Update Count     : 746
     12// Last Modified On : Mon Mar 15 14:13:01 2021
     13// Update Count     : 747
    1414//
    1515
     
    4242#include <eti.h>
    4343#include <execinfo.h>
    44 //#include <expat.h>                                                                    // 32-bit attribute-location problem
     44#include <expat.h>
    4545#include <expat_external.h>
    4646#include <fcntl.h>
     
    9090#include <poll.h>
    9191#include <printf.h>
    92 #include <proc_service.h>
    9392#include <pthread.h>
    9493#include <pty.h>
     
    122121#include <termio.h>
    123122#include <termios.h>
    124 #include <term_entry.h>
     123// #include <term_entry.h>                                                              // conflicts with search.h on some machines
    125124#include <tgmath.h>
    126125//#include <threads.h>                                                                  // does not exist
     
    137136#include <utmpx.h>
    138137#include <values.h>
     138#pragma GCC diagnostic push
     139#pragma GCC diagnostic ignored "-Wattributes"
    139140#include <wait.h>
     141#pragma GCC diagnostic pop
    140142#include <wchar.h>
    141143#include <wctype.h>
Note: See TracChangeset for help on using the changeset viewer.