uxn

commit 9c3536bca8589659a3a89b59c414932911968fc2
parent 3dbe34ecaa99a8b1c1965059ffbe2053b81da7c6
Author: Sigrid Solveig Haflínudóttir <ftrvxmtrx@gmail.com>
Date:   Thu, 22 Apr 2021 18:04:06 +0000

ppu: rename draw → drawppu to avoid conflicts on Plan 9

Diffstat:
M
src/emulator.c
 | 
2
+-
M
src/ppu.c
 | 
5
++---
M
src/ppu.h
 | 
5
++---

3 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/src/emulator.c b/src/emulator.c
@@ -49,7 +49,7 @@ audio_callback(void *u, Uint8 *stream, int len)
 void
 redraw(Uint32 *dst, Uxn *u)
 {
-	draw(&ppu);
+	drawppu(&ppu);
 	if(debug)
 		drawdebugger(&ppu, u->wst.dat, u->wst.ptr);
 	SDL_UpdateTexture(gTexture, NULL, dst, ppu.width * sizeof(Uint32));
diff --git a/src/ppu.c b/src/ppu.c
@@ -126,7 +126,7 @@ drawdebugger(Ppu *p, Uint8 *stack, Uint8 ptr)
 }
 
 void
-draw(Ppu *p)
+drawppu(Ppu *p)
 {
 	Uint16 x, y;
 	for(y = 0; y < p->ver; ++y)
@@ -164,4 +164,4 @@ initppu(Ppu *p, Uint8 hor, Uint8 ver, Uint8 pad)
 		return 0;
 	clear(p);
 	return 1;
-}
-\ No newline at end of file
+}
diff --git a/src/ppu.h b/src/ppu.h
@@ -28,5 +28,5 @@ void putcolors(Ppu *p, Uint8 *addr);
 void putpixel(Ppu *p, Uint8 *layer, Uint16 x, Uint16 y, Uint8 color);
 void puticn(Ppu *p, Uint8 *layer, Uint16 x, Uint16 y, Uint8 *sprite, Uint8 color);
 void putchr(Ppu *p, Uint8 *layer, Uint16 x, Uint16 y, Uint8 *sprite, Uint8 color);
-void draw(Ppu *p);
-void drawdebugger(Ppu *p, Uint8 *stack, Uint8 ptr);
-\ No newline at end of file
+void drawppu(Ppu *p);
+void drawdebugger(Ppu *p, Uint8 *stack, Uint8 ptr);