summaryrefslogtreecommitdiff
path: root/textscreen/txt_io.c
diff options
context:
space:
mode:
authorJames Haley2010-01-26 00:59:02 +0000
committerJames Haley2010-01-26 00:59:02 +0000
commitb80409202d07732ec201c9816887262b505b81d4 (patch)
tree364dcb86f2c22411a720447bfa21c4de9191ff6f /textscreen/txt_io.c
parent66e8dc63bd0b384c99f0d0ff60b3d75c42d441b1 (diff)
parent8f6edc1f7402215c5e38d1f03939ce6b5ff5e3ae (diff)
downloadchocolate-doom-b80409202d07732ec201c9816887262b505b81d4.tar.gz
chocolate-doom-b80409202d07732ec201c9816887262b505b81d4.tar.bz2
chocolate-doom-b80409202d07732ec201c9816887262b505b81d4.zip
Merge from raven-branch
Subversion-branch: /branches/strife-branch Subversion-revision: 1825
Diffstat (limited to 'textscreen/txt_io.c')
-rw-r--r--textscreen/txt_io.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/textscreen/txt_io.c b/textscreen/txt_io.c
index 1e8106e7..1ecc7bd6 100644
--- a/textscreen/txt_io.c
+++ b/textscreen/txt_io.c
@@ -33,7 +33,7 @@
static struct
{
txt_color_t color;
- char *name;
+ const char *name;
} colors[] = {
{TXT_COLOR_BLACK, "black"},
{TXT_COLOR_BLUE, "blue"},
@@ -147,11 +147,11 @@ void TXT_PutChar(int c)
PutChar(screen, c);
}
-void TXT_Puts(char *s)
+void TXT_Puts(const char *s)
{
int previous_color = TXT_COLOR_BLACK;
unsigned char *screen;
- char *p;
+ const char *p;
char colorname_buf[20];
char *ending;
int col;