adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix some merge wobbles in headers

Browse Source
This commit is contained in:
Michael Martin
2020-04-03 22:20:14 -07:00
parent 9f193f123e
commit a0823420c3
2 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/libs/input/sdl/input.c
-2
View File
@@ -220,8 +220,6 @@ TFB_SetInputVectors (volatile int menu[], int num_menu_, volatile int flight[],
num_flight = num_flight_; num_flight = num_flight_;
} }
#ifdef HAVE_JOYSTICK
static void static void
initJoystick (void) initJoystick (void)
{ {
sc2/src/uqm/cnctdlg.h
-2
View File
@@ -21,8 +21,6 @@
#ifndef UQM_CNCTDLG_H_ #ifndef UQM_CNCTDLG_H_
#define UQM_CNCTDLG_H_ #define UQM_CNCTDLG_H_
#ifdef NETPLAY
#include "libs/compiler.h" #include "libs/compiler.h"
#if defined(__cplusplus) #if defined(__cplusplus)