From 7c878bc02e490fe8d0ff849e2332876c049672fd Mon Sep 17 00:00:00 2001 From: Packit Service Date: Dec 10 2020 00:14:14 +0000 Subject: Apply patch opensp-multilib.patch patch_name: opensp-multilib.patch present_in_specfile: true --- diff --git a/config.h.in b/config.h.in index 12a461a..7b54af2 100644 --- a/config.h.in +++ b/config.h.in @@ -1,5 +1,7 @@ /* config.h.in. Generated from configure.in by autoheader. */ +#include + /* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP systems. This function is required for `alloca.c' support on those systems. */ @@ -333,22 +335,6 @@ /* The size of a `bool', as computed by sizeof. */ #undef SIZEOF_BOOL -/* The size of a `size_t', as computed by sizeof. */ -#undef SIZEOF_SIZE_T - -/* The size of a `unsigned int', as computed by sizeof. */ -#undef SIZEOF_UNSIGNED_INT - -/* The size of a `unsigned short', as computed by sizeof. */ -#undef SIZEOF_UNSIGNED_SHORT - -/* The size of a `wchar_t', as computed by sizeof. */ -#undef SIZEOF_WCHAR_T - -/* Define as the maximum value of type 'size_t', if the system doesn't define - it. */ -#undef SIZE_MAX - /* define this if h_errno should be declared extern int */ #undef SP_DECLARE_H_ERRNO @@ -503,7 +489,7 @@ #define SP_SIZEOF_BOOL_1 #endif -#if (SIZEOF_WCHAR_T == SIZEOF_UNSIGNED_SHORT) +#if (WCHAR_MAX == SHRT_MAX) #define SP_WCHAR_T_USHORT #endif diff --git a/configure.in b/configure.in index 22b5fde..fbfb311 100644 --- a/configure.in +++ b/configure.in @@ -90,7 +90,7 @@ AH_BOTTOM([ #define SP_SIZEOF_BOOL_1 #endif -#if (SIZEOF_WCHAR_T == SIZEOF_UNSIGNED_SHORT) +#if (WCHAR_MAX == SHRT_MAX) #define SP_WCHAR_T_USHORT #endif diff --git a/lib/parser_inst.cxx b/lib/parser_inst.cxx index a7f7863..f71b3a6 100644 --- a/lib/parser_inst.cxx +++ b/lib/parser_inst.cxx @@ -9,6 +9,7 @@ namespace SP_NAMESPACE { // Copyright (c) 1994 James Clark // See the file COPYING for copying permission. +#include #include "splib.h" #ifdef SP_MANUAL_INST @@ -1338,7 +1339,7 @@ typedef Vector Dummy_96; #endif #endif // we really just want to test if size_t == unsigned int -#if !defined(SIZEOF_SIZE_T) || !defined(SIZEOF_UNSIGNED_INT) || (SIZEOF_SIZE_T != SIZEOF_UNSIGNED_INT) +#if INT_MAX != SSIZE_MAX #ifdef __DECCXX #pragma define_template Vector #else diff --git a/lib/parser_inst.m4 b/lib/parser_inst.m4 index 541c614..29addb1 100644 --- a/lib/parser_inst.m4 +++ b/lib/parser_inst.m4 @@ -1,6 +1,7 @@ // Copyright (c) 1994 James Clark // See the file COPYING for copying permission. +#include #include "splib.h" #ifdef SP_MANUAL_INST @@ -166,7 +167,7 @@ __instantiate(Vector) __instantiate(Vector) __instantiate(Vector) // we really just want to test if size_t == unsigned int -#if !defined(SIZEOF_SIZE_T) || !defined(SIZEOF_UNSIGNED_INT) || (SIZEOF_SIZE_T != SIZEOF_UNSIGNED_INT) +#if INT_MAX != SSIZE_MAX __instantiate(Vector) #endif