Ignore:
Timestamp:
Jul 19, 2019, 4:52:59 PM (5 years ago)
Author:
Peter A. Buhr <pabuhr@…>
Branches:
ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum
Children:
b5ce31e, fd642d2
Parents:
e723100 (diff), 335d81f (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
  • libcfa/src/bits/locks.hfa

    re723100 r884f1409  
    5050#ifdef __cforall
    5151        extern "C" {
    52                 extern void disable_interrupts();
    53                 extern void enable_interrupts_noPoll();
     52                extern void disable_interrupts() OPTIONAL_THREAD;
     53                extern void enable_interrupts_noPoll() OPTIONAL_THREAD;
    5454
    5555                #ifdef __CFA_DEBUG__
Note: See TracChangeset for help on using the changeset viewer.