From 373b59b94fa93b78527c50a0af9aea84e09a569b Mon Sep 17 00:00:00 2001 From: Magnus Norddahl Date: Fri, 3 Jun 2016 14:06:44 +0200 Subject: [PATCH] Fix dovline4 being a define on X64_ASM --- src/r_draw.cpp | 2 +- src/r_draw.h | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/src/r_draw.cpp b/src/r_draw.cpp index aed4bbeea..ccaa864e6 100644 --- a/src/r_draw.cpp +++ b/src/r_draw.cpp @@ -3036,8 +3036,8 @@ DWORD (*doprevline1)() = vlinec1; #ifdef X64_ASM extern "C" void vlinetallasm4(); -#define dovline4 vlinetallasm4 extern "C" void setupvlinetallasm (int); +void (*dovline4)() = vlinetallasm4; #else static void vlinec4 (); void (*dovline4)() = vlinec4; diff --git a/src/r_draw.h b/src/r_draw.h index 27a985dcb..2eefff9bd 100644 --- a/src/r_draw.h +++ b/src/r_draw.h @@ -71,12 +71,7 @@ extern void (*R_DrawColumn)(void); extern DWORD (*dovline1) (); extern DWORD (*doprevline1) (); -#ifdef X64_ASM -#define dovline4 vlinetallasm4 -extern "C" void vlinetallasm4(); -#else extern void (*dovline4) (); -#endif extern void setupvline (int); extern DWORD (*domvline1) ();