Mercurial > hg > early-roguelike
comparison rogue4/misc.c @ 239:837044d2c362
Merge the GCC5 and build fix branches.
This fixes all warnings produced by GCC 5, except the ones related to
system functions. Those could be fixed by including the proper headers,
but it would be better to replace the system-dependent code with
functions from mdport.c.
| author | John "Elwin" Edwards |
|---|---|
| date | Fri, 11 Mar 2016 19:47:52 -0500 |
| parents | 0990adf580ee |
| children | 0250220d8cdd |
comparison
equal
deleted
inserted
replaced
| 232:bac2c81fec78 | 239:837044d2c362 |
|---|---|
| 343 * vowelstr: | 343 * vowelstr: |
| 344 * For printfs: if string starts with a vowel, return "n" for an | 344 * For printfs: if string starts with a vowel, return "n" for an |
| 345 * "an". | 345 * "an". |
| 346 */ | 346 */ |
| 347 char * | 347 char * |
| 348 vowelstr(char *str) | 348 vowelstr(const char *str) |
| 349 { | 349 { |
| 350 switch (*str) | 350 switch (*str) |
| 351 { | 351 { |
| 352 case 'a': case 'A': | 352 case 'a': case 'A': |
| 353 case 'e': case 'E': | 353 case 'e': case 'E': |