diff options
| author | Andreas Baumann <mail@andreasbaumann.cc> | 2017-07-01 12:26:40 +0200 |
|---|---|---|
| committer | Andreas Baumann <mail@andreasbaumann.cc> | 2017-07-01 12:26:40 +0200 |
| commit | f06b0dbb4d06a130d61d6fa1d9edc797247d284a (patch) | |
| tree | 5cbf67f6b27f57ebfa5dcd147f050c0595360eb4 | |
| parent | 25228d8927af801667d4be2ea85ee517d1916fc7 (diff) | |
| download | abaos-f06b0dbb4d06a130d61d6fa1d9edc797247d284a.tar.gz abaos-f06b0dbb4d06a130d61d6fa1d9edc797247d284a.tar.bz2 | |
readded -Werror and fixed some cast errors around memcpy
| -rw-r--r-- | src/Makefile | 2 | ||||
| -rw-r--r-- | src/kernel/vgatext.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/Makefile b/src/Makefile index a6781ba..bcb0da7 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,6 +1,6 @@ CC := gcc INCLUDES = -I. -Ilibc -Ihardware -Idrivers -Idrivers/hdi -Idrivers/hdi/ps2 -Ikernel -Igui -CFLAGS := -std=c99 -m32 -ffreestanding -O0 -g -Wall $(INCLUDES) +CFLAGS := -std=c99 -m32 -ffreestanding -O0 -g -Wall -Werror $(INCLUDES) LD := ld NASMFLAGS := -f elf32 NASM := nasm diff --git a/src/kernel/vgatext.c b/src/kernel/vgatext.c index 232d91a..49c8c3c 100644 --- a/src/kernel/vgatext.c +++ b/src/kernel/vgatext.c @@ -266,12 +266,12 @@ void vga_text_save( vga_text_t *vga_text ) { volatile uint8_t *VIDEO_MEMORY = (uint8_t *)0xA0000; - memcpy( vga_text->buf, VIDEO_MEMORY, 2*65535 ); + memcpy( vga_text->buf, (const uint8_t *)VIDEO_MEMORY, 2*65535 ); } void vga_text_restore( vga_text_t *vga_text ) { volatile uint8_t *VIDEO_MEMORY = (uint8_t *)0xA0000; - memcpy( VIDEO_MEMORY, vga_text->buf, 2*65535 ); + memcpy( (void *)VIDEO_MEMORY, (const uint8_t *)vga_text->buf, 2*65535 ); } |