all repos — mgba @ 2279521482689b79d3baa5be7560431b11825ca1

mGBA Game Boy Advance Emulator

Minor cleanup
Vicki Pfau vi@endrift.com
Wed, 17 Jun 2020 22:15:36 -0700
commit

2279521482689b79d3baa5be7560431b11825ca1

parent

c0826109925cecab27860453c357e8cae97eb3ea

2 files changed, 1 insertions(+), 2 deletions(-)

jump to
M include/mgba/internal/ds/memory.h → include/mgba/internal/ds/memory.h 
@@ -18,7 +18,7 @@ #include <mgba/internal/ds/io.h>
 #include <mgba/internal/ds/slot1.h>
 #include <mgba/internal/ds/spi.h>
 
-const uint32_t redzoneInstruction;
+extern const uint32_t redzoneInstruction;
 
 enum DSMemoryRegion {
 	DS7_REGION_BIOS = 0x0,
M src/gb/input.c → src/gb/input.c 
@@ -1,5 +1,4 @@
 /* Copyright (c) 2013-2019 Jeffrey Pfau
->>>>>>> master
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this