this repo has no description
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

attempts at fixing build errors on foreign targets

+19 -18
+19 -18
vendor/s7/s7.c
··· 201 201 /* this removes the name "unquote" */ 202 202 #endif 203 203 204 - #ifndef WITH_C_LOADER 205 - #if WITH_GCC && (!__MINGW32__) && (!__CYGWIN__) 206 - #define WITH_C_LOADER 1 207 - /* (load file.so [e]) looks for (e 'init_func) and if found, calls it as the shared object init function. 208 - * If WITH_SYSTEM_EXTRAS is 0, the caller needs to supply system and delete-file so that cload.scm works. 209 - */ 210 - #else 211 - #define WITH_C_LOADER 0 212 - /* I think dlopen et al are available in MS C, but I have no way to test them; see load_shared_object below */ 213 - #endif 214 - #endif 204 + /* #ifndef WITH_C_LOADER */ 205 + /* #if WITH_GCC && (!__MINGW32__) && (!__CYGWIN__) */ 206 + /* #define WITH_C_LOADER 1 */ 207 + /* /\* (load file.so [e]) looks for (e 'init_func) and if found, calls it as the shared object init function. */ 208 + /* * If WITH_SYSTEM_EXTRAS is 0, the caller needs to supply system and delete-file so that cload.scm works. */ 209 + /* *\/ */ 210 + /* #else */ 211 + /* #define WITH_C_LOADER 0 */ 212 + /* /\* I think dlopen et al are available in MS C, but I have no way to test them; see load_shared_object below *\/ */ 213 + /* #endif */ 214 + /* #endif */ 215 + #define WITH_C_LOADER 0 215 216 216 217 #ifndef WITH_HISTORY 217 218 #define WITH_HISTORY 0 ··· 333 334 #endif 334 335 335 336 #ifdef _MSC_VER 336 - #define noreturn _Noreturn /* deprecated in C23 */ 337 + #define noreturn [[noreturn]] /* deprecated in C23 */ 337 338 #else 338 339 #define noreturn __attribute__((noreturn)) 339 340 /* this is ok in gcc/g++/clang and tcc; pure attribute is rarely applicable here, and does not seem to be helpful (maybe safe_strlen) */ ··· 363 364 #define MS_WINDOWS 0 364 365 #endif 365 366 366 - #if defined(_MSC_VER) || defined(__MINGW32__) 367 - #define Jmp_Buf jmp_buf 368 - #define SetJmp(A, B) setjmp(A) 369 - #define LongJmp(A, B) longjmp(A, B) 370 - #else 367 + #if defined(__GNUC__) 371 368 #define Jmp_Buf sigjmp_buf 372 369 #define SetJmp(A, B) sigsetjmp(A, B) 373 370 #define LongJmp(A, B) siglongjmp(A, B) ··· 376 373 * In one case, the sigsetjmp version runs in 24 seconds, but the setjmp version takes 10 seconds, and 377 374 * yet callgrind says there is almost no difference? I removed setjmp from s7_optimize. 378 375 */ 376 + #elif defined(_MSC_VER) || defined(__MINGW32__) 377 + #define Jmp_Buf jmp_buf 378 + #define SetJmp(A, B) setjmp(A) 379 + #define LongJmp(A, B) longjmp(A, B) 379 380 #endif 380 381 381 382 #if (!MS_WINDOWS) ··· 12987 12988 static s7_complex catanh(s7_complex z) {return(clog((1.0 + z) / (1.0 - z)) / 2.0);} 12988 12989 #else 12989 12990 12990 - #if (!defined(__FreeBSD__)) || (__FreeBSD__ < 12) 12991 + #if (!defined(__FreeBSD__)) || (__FreeBSD__ < 12) || defined(__ANDROID__) 12991 12992 static s7_complex clog(s7_complex z) {return(log(fabs(cabs(z))) + carg(z) * _Complex_I);} 12992 12993 static s7_complex cpow(s7_complex x, s7_complex y) 12993 12994 {