From 3a91332a70abfc777a352c46727f54426c982371 Mon Sep 17 00:00:00 2001
From: "Nicolas \"Pixel\" Noble" <pixel@nobis-crew.org>
Date: Fri, 20 Dec 2013 01:34:09 -0800
Subject: A few more Win32 / VisualStudio fixes.

---
 includes/Task.h | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

(limited to 'includes/Task.h')

diff --git a/includes/Task.h b/includes/Task.h
index 3d206ff..1041d08 100644
--- a/includes/Task.h
+++ b/includes/Task.h
@@ -10,10 +10,6 @@
 #include <Exceptions.h>
 #include <Printer.h>
 
-#ifdef _MSC_VER
-#include <Windows.h> // for CALLBACK
-#endif
-
 namespace Balau {
 
 namespace Events { class BaseEvent; };
@@ -119,10 +115,6 @@ class Async : public BaseEvent {
     ev::async m_evt;
 };
 
-#ifndef _WIN32
-#define CALLBACK
-#endif
-
 class Custom : public BaseEvent {
   public:
     void doSignal() { BaseEvent::doSignal(); ev_break(m_loop, EVBREAK_ALL); }
@@ -180,6 +172,7 @@ class Task {
       private:
         bool m_oldStatus;
     };
+    static void registerTrampoline();
   protected:
     void yield() throw (GeneralException) {
         if (yield(false)) {
@@ -223,7 +216,7 @@ class Task {
     void setup(TaskMan * taskMan, void * stack);
     static bool needsStacks();
     void switchTo();
-    static void CALLBACK coroutineTrampoline(void *);
+    static void coroutineTrampoline(void *);
     void coroutine();
     bool enterSimpleContext() {
         bool r;
-- 
cgit v1.2.3