Minor compile error fixes when X86_ASM is defined

This commit is contained in:
Magnus Norddahl 2016-06-02 21:39:44 +02:00
parent 02a39ef457
commit 7142faf41d
2 changed files with 5 additions and 5 deletions

View file

@ -3025,9 +3025,11 @@ extern "C" void R_DrawSlabC(int dx, fixed_t v, int dy, fixed_t vi, const BYTE *v
// wallscan stuff, in C // wallscan stuff, in C
static int vlinebits;
static int mvlinebits;
#ifndef X86_ASM #ifndef X86_ASM
static DWORD vlinec1 (); static DWORD vlinec1 ();
static int vlinebits;
DWORD (*dovline1)() = vlinec1; DWORD (*dovline1)() = vlinec1;
DWORD (*doprevline1)() = vlinec1; DWORD (*doprevline1)() = vlinec1;
@ -3043,7 +3045,6 @@ void (*dovline4)() = vlinec4;
static DWORD mvlinec1(); static DWORD mvlinec1();
static void mvlinec4(); static void mvlinec4();
static int mvlinebits;
DWORD (*domvline1)() = mvlinec1; DWORD (*domvline1)() = mvlinec1;
void (*domvline4)() = mvlinec4; void (*domvline4)() = mvlinec4;
@ -4532,7 +4533,6 @@ void R_InitColumnDrawers ()
rt_tlateaddclamp1col = rt_tlateaddclamp1col_c; rt_tlateaddclamp1col = rt_tlateaddclamp1col_c;
rt_tlatesubclamp1col = rt_tlatesubclamp1col_c; rt_tlatesubclamp1col = rt_tlatesubclamp1col_c;
rt_tlaterevsubclamp1col = rt_tlaterevsubclamp1col_c; rt_tlaterevsubclamp1col = rt_tlaterevsubclamp1col_c;
rt_map4cols = rt_map4cols_c;
rt_subclamp4cols = rt_subclamp4cols_c; rt_subclamp4cols = rt_subclamp4cols_c;
rt_revsubclamp4cols = rt_revsubclamp4cols_c; rt_revsubclamp4cols = rt_revsubclamp4cols_c;
rt_tlate4cols = rt_tlate4cols_c; rt_tlate4cols = rt_tlate4cols_c;

View file

@ -265,6 +265,8 @@ void R_DrawShadedColumnP_C (void);
void R_DrawSpanP_C (void); void R_DrawSpanP_C (void);
void R_DrawSpanMaskedP_C (void); void R_DrawSpanMaskedP_C (void);
#endif
void R_DrawColumnHorizP_RGBA_C (void); void R_DrawColumnHorizP_RGBA_C (void);
void R_DrawColumnP_RGBA_C (void); void R_DrawColumnP_RGBA_C (void);
void R_DrawFuzzColumnP_RGBA_C (void); void R_DrawFuzzColumnP_RGBA_C (void);
@ -274,8 +276,6 @@ void R_DrawSpanP_RGBA_C (void);
void R_DrawSpanP_RGBA_SSE (void); void R_DrawSpanP_RGBA_SSE (void);
void R_DrawSpanMaskedP_RGBA_C (void); void R_DrawSpanMaskedP_RGBA_C (void);
#endif
void R_DrawSpanTranslucentP_C (void); void R_DrawSpanTranslucentP_C (void);
void R_DrawSpanMaskedTranslucentP_C (void); void R_DrawSpanMaskedTranslucentP_C (void);