Unbreak C++11 due to narrowing; use non-conflicting declaration FISH_COLORS instead of COLORS; remove deprecated register type.

This commit is contained in:
ridiculousfish
2014-02-05 16:20:09 -08:00
parent 35f2302352
commit fd10844c2b
3 changed files with 10 additions and 6 deletions

View File

@@ -270,7 +270,7 @@ exchange(wchar_t **argv)
{
/* Bottom segment is the short one. */
int len = middle - bottom;
register int i;
short i;
/* Swap it with the top part of the top segment. */
for (i = 0; i < len; i++)
@@ -286,7 +286,7 @@ exchange(wchar_t **argv)
{
/* Top segment is the short one. */
int len = top - middle;
register int i;
short i;
/* Swap it with the bottom part of the bottom segment. */
for (i = 0; i < len; i++)