Ignore:
Timestamp:
Dec 5, 2017, 2:35:03 PM (8 years ago)
Author:
Rob Schluntz <rschlunt@…>
Branches:
ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum
Children:
f9feab8
Parents:
9c35431 (diff), 65197c2 (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' into cleanup-dtors

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/libcfa/concurrency/kernel_private.h

    r9c35431 rc13e8dc8  
    1616#pragma once
    1717
    18 #include "libhdr.h"
    19 
    2018#include "kernel"
    2119#include "thread"
     
    3028        void disable_interrupts();
    3129        void enable_interrupts_noPoll();
    32         void enable_interrupts( DEBUG_CTX_PARAM );
     30        void enable_interrupts( __cfaabi_dbg_ctx_param );
    3331}
    3432
     
    3937        disable_interrupts();
    4038        ScheduleThread( thrd );
    41         enable_interrupts( DEBUG_CTX );
     39        enable_interrupts( __cfaabi_dbg_ctx );
    4240}
    4341thread_desc * nextThread(cluster * this);
Note: See TracChangeset for help on using the changeset viewer.