diff --git a/source/collada/Decompose.cpp b/source/collada/Decompose.cpp index b318fd34df..a982cb2617 100644 --- a/source/collada/Decompose.cpp +++ b/source/collada/Decompose.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2013 Wildfire Games. +/* Copyright (C) 2015 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -124,7 +124,7 @@ Quat Qt_FromMatrix(HMatrix mat) * Otherwise, the largest diagonal entry corresponds to the largest of |x|, * |y|, or |z|, one of which must be larger than |w|, and at least 1/2. */ Quat qu; - register double tr, s; + double tr, s; tr = mat[X][X] + mat[Y][Y]+ mat[Z][Z]; if (tr >= 0.0) { diff --git a/source/third_party/mongoose/mongoose.cpp b/source/third_party/mongoose/mongoose.cpp index 0e0f2ee743..203cc18e8c 100644 --- a/source/third_party/mongoose/mongoose.cpp +++ b/source/third_party/mongoose/mongoose.cpp @@ -11,6 +11,7 @@ // in the build system. // * To avoid debug spew, we disable DEBUG. // * Use memcopy to get rid of strict-aliasing warning +// * Remove use of deprecated 'register' storage class #define __STDC_LIMIT_MACROS @@ -1855,7 +1856,7 @@ static void MD5Init(MD5_CTX *ctx) { } static void MD5Transform(uint32_t buf[4], uint32_t const in[16]) { - register uint32_t a, b, c, d; + uint32_t a, b, c, d; a = buf[0]; b = buf[1];