diff options
| author | Simon Howard | 2009-11-21 16:36:46 +0000 |
|---|---|---|
| committer | Simon Howard | 2009-11-21 16:36:46 +0000 |
| commit | afa0c4c7979c1508605d0e79487f299cd03adda6 (patch) | |
| tree | 7df1745badf169e4490e3a56a89a28ac37977c14 /textscreen/txt_io.c | |
| parent | 095bc1110b3c11fbf2e17bfd51bf78909fe34662 (diff) | |
| parent | 2c6e7b2f10c32ca0406ca6753e7701d83e6dea8f (diff) | |
| download | chocolate-doom-afa0c4c7979c1508605d0e79487f299cd03adda6.tar.gz chocolate-doom-afa0c4c7979c1508605d0e79487f299cd03adda6.tar.bz2 chocolate-doom-afa0c4c7979c1508605d0e79487f299cd03adda6.zip | |
Merge from trunk.
Subversion-branch: /branches/raven-branch
Subversion-revision: 1737
Diffstat (limited to 'textscreen/txt_io.c')
| -rw-r--r-- | textscreen/txt_io.c | 6 |
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; |