Merge pull request #1 from R41z/master

Fix build on Linux
This commit is contained in:
Pierre Pronchery 2016-10-27 01:35:17 +02:00 committed by GitHub
commit 2b2e304f48

View File

@ -13,7 +13,7 @@
* You should have received a copy of the GNU Lesser General Public License * You should have received a copy of the GNU Lesser General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. */ * along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include <sys/types.h>
#include <stdint.h> #include <stdint.h>
#include <stdlib.h> #include <stdlib.h>
@ -43,7 +43,7 @@ Array * array_new(size_t size)
Array * array; Array * array;
/* check for overflows */ /* check for overflows */
if(UINT32_MAX < SIZE_T_MAX && size > UINT32_MAX) if(UINT32_MAX < SIZE_MAX && size > UINT32_MAX)
{ {
error_set_code(-ERANGE, "%s", strerror(ERANGE)); error_set_code(-ERANGE, "%s", strerror(ERANGE));
return NULL; return NULL;
@ -114,7 +114,7 @@ int array_set(Array * array, size_t pos, void * value)
{ {
/* grow the array */ /* grow the array */
if(UINT64_MAX - offset < array->size if(UINT64_MAX - offset < array->size
|| offset + array->size > SIZE_T_MAX) || offset + array->size > SIZE_MAX)
return -error_set_code(-ERANGE, "%s", strerror(ERANGE)); return -error_set_code(-ERANGE, "%s", strerror(ERANGE));
if((q = realloc(array->value, offset + array->size)) == NULL) if((q = realloc(array->value, offset + array->size)) == NULL)
return -error_set_code(-errno, "%s", strerror(errno)); return -error_set_code(-errno, "%s", strerror(errno));
@ -138,7 +138,7 @@ int array_append(Array * array, void * value)
/* check for overflows */ /* check for overflows */
if(UINT64_MAX - offset < array->size if(UINT64_MAX - offset < array->size
|| offset + array->size > SIZE_T_MAX) || offset + array->size > SIZE_MAX)
return -error_set_code(-ERANGE, "%s", strerror(ERANGE)); return -error_set_code(-ERANGE, "%s", strerror(ERANGE));
if((p = realloc(array->value, offset + array->size)) == NULL) if((p = realloc(array->value, offset + array->size)) == NULL)
return error_set_code(-errno, "%s", strerror(errno)); return error_set_code(-errno, "%s", strerror(errno));