Browse code
don't use stdint.h in configure.in tests (bb #673)
| ... | ... |
@@ -20235,14 +20235,13 @@ cat confdefs.h >>conftest.$ac_ext |
| 20235 | 20235 |
cat >>conftest.$ac_ext <<_ACEOF |
| 20236 | 20236 |
/* end confdefs.h. */ |
| 20237 | 20237 |
|
| 20238 |
-#include <stdint.h> |
|
| 20239 | 20238 |
#include <stdio.h> |
| 20240 | 20239 |
static struct v{
|
| 20241 | 20240 |
char* dst; |
| 20242 |
- uint32_t dsize; |
|
| 20243 |
- uint32_t dcur; |
|
| 20244 |
- uint32_t backsize; |
|
| 20245 |
- int32_t unp_offset; |
|
| 20241 |
+ unsigned long dsize; |
|
| 20242 |
+ unsigned long dcur; |
|
| 20243 |
+ unsigned long backsize; |
|
| 20244 |
+ signed long unp_offset; |
|
| 20246 | 20245 |
} values[] = {
|
| 20247 | 20246 |
{(char*)0xf78ab008, 0x2e000, 1, 4, 0xfffff9f3},
|
| 20248 | 20247 |
{(char*)0xb7af1008, 0x2e000, 1, 4, 0xfffff9f3}
|
| ... | ... |
@@ -20260,10 +20259,10 @@ int main() |
| 20260 | 20260 |
for(i=0;i<sizeof(values)/sizeof(values[0]);i++) {
|
| 20261 | 20261 |
struct v* v= &values[i]; |
| 20262 | 20262 |
char* dst = v->dst; |
| 20263 |
- uint32_t* dsize = &v->dsize; |
|
| 20264 |
- uint32_t dcur = v->dcur; |
|
| 20265 |
- uint32_t backsize = v->backsize-1; |
|
| 20266 |
- int32_t unp_offset = v->unp_offset; |
|
| 20263 |
+ unsigned long* dsize = &v->dsize; |
|
| 20264 |
+ unsigned long dcur = v->dcur; |
|
| 20265 |
+ unsigned long backsize = v->backsize-1; |
|
| 20266 |
+ signed long unp_offset = v->unp_offset; |
|
| 20267 | 20267 |
|
| 20268 | 20268 |
if(!CLI_ISCONTAINED(dst, *dsize, dst+dcur+unp_offset, backsize) || |
| 20269 | 20269 |
!CLI_ISCONTAINED(dst, *dsize,dst+dcur,backsize) || unp_offset >= 0) {
|
| ... | ... |
@@ -147,15 +147,14 @@ int main(void) |
| 147 | 147 |
dnl Check if compiler produces invalid code on own testcase based on upx.c |
| 148 | 148 |
AC_MSG_CHECKING([for valid code generation of CLI_ISCONTAINED]) |
| 149 | 149 |
AC_TRY_RUN( |
| 150 |
- [ |
|
| 151 |
-#include <stdint.h> |
|
| 150 |
+ [ |
|
| 152 | 151 |
#include <stdio.h> |
| 153 | 152 |
static struct v{
|
| 154 | 153 |
char* dst; |
| 155 |
- uint32_t dsize; |
|
| 156 |
- uint32_t dcur; |
|
| 157 |
- uint32_t backsize; |
|
| 158 |
- int32_t unp_offset; |
|
| 154 |
+ unsigned long dsize; |
|
| 155 |
+ unsigned long dcur; |
|
| 156 |
+ unsigned long backsize; |
|
| 157 |
+ signed long unp_offset; |
|
| 159 | 158 |
} values[] = {
|
| 160 | 159 |
{(char*)0xf78ab008, 0x2e000, 1, 4, 0xfffff9f3},
|
| 161 | 160 |
{(char*)0xb7af1008, 0x2e000, 1, 4, 0xfffff9f3}
|
| ... | ... |
@@ -173,10 +172,10 @@ int main() |
| 173 | 173 |
for(i=0;i<sizeof(values)/sizeof(values[0]);i++) {
|
| 174 | 174 |
struct v* v= &values[i]; |
| 175 | 175 |
char* dst = v->dst; |
| 176 |
- uint32_t* dsize = &v->dsize; |
|
| 177 |
- uint32_t dcur = v->dcur; |
|
| 178 |
- uint32_t backsize = v->backsize-1; |
|
| 179 |
- int32_t unp_offset = v->unp_offset; |
|
| 176 |
+ unsigned long* dsize = &v->dsize; |
|
| 177 |
+ unsigned long dcur = v->dcur; |
|
| 178 |
+ unsigned long backsize = v->backsize-1; |
|
| 179 |
+ signed long unp_offset = v->unp_offset; |
|
| 180 | 180 |
|
| 181 | 181 |
if(!CLI_ISCONTAINED(dst, *dsize, dst+dcur+unp_offset, backsize) || |
| 182 | 182 |
!CLI_ISCONTAINED(dst, *dsize,dst+dcur,backsize) || unp_offset >= 0) {
|