mirrors/ecl
1
Fork 0
mirror of https://gitlab.com/embeddable-common-lisp/ecl.git synced 2026-01-13 21:02:47 -08:00
Code Issues Projects Releases Packages Wiki Activity

msvc: rename labels INT' and FLOAT' to fix build with VS2013 CE

Browse source 
Patch provided by community members lll and Dinosky. Fixes #7.

Signed-off-by: Daniel Kochmański <dkochmanski@turtle-solutions.eu>
This commit is contained in:
Daniel Kochmański 2015-07-04 20:51:51 +02:00
parent 5b4a6b81a0
commit 663de5ddfe
2 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

40
src/c/arch/ffi_x86.d
View file

@ -31,19 +31,19 @@ ecl_fficall_push_arg(union ecl_ffi_values *data, enum ecl_ffi_tag type)
{
int i;
switch (type) {
case ECL_FFI_CHAR: i = data->c; goto INT;
case ECL_FFI_UNSIGNED_CHAR: i = data->uc; goto INT;
case ECL_FFI_BYTE: i = data->b; goto INT;
case ECL_FFI_UNSIGNED_BYTE: i = data->ub; goto INT;
case ECL_FFI_SHORT: i = data->s; goto INT;
case ECL_FFI_UNSIGNED_SHORT: i = data->us; goto INT;
case ECL_FFI_CHAR: i = data->c; goto INT_ECL;
case ECL_FFI_UNSIGNED_CHAR: i = data->uc; goto INT_ECL;
case ECL_FFI_BYTE: i = data->b; goto INT_ECL;
case ECL_FFI_UNSIGNED_BYTE: i = data->ub; goto INT_ECL;
case ECL_FFI_SHORT: i = data->s; goto INT_ECL;
case ECL_FFI_UNSIGNED_SHORT: i = data->us; goto INT_ECL;
#ifdef ecl_uint8_t
case ECL_FFI_INT8_T: i = data->i8; goto INT;
case ECL_FFI_UINT8_T: i = data->u8; goto INT;
case ECL_FFI_INT8_T: i = data->i8; goto INT_ECL;
case ECL_FFI_UINT8_T: i = data->u8; goto INT_ECL;
#endif
#ifdef ecl_uint16_t
case ECL_FFI_INT16_T: i = data->i16; goto INT;
case ECL_FFI_UINT16_T: i = data->u16; goto INT;
case ECL_FFI_INT16_T: i = data->i16; goto INT_ECL;
case ECL_FFI_UINT16_T: i = data->u16; goto INT_ECL;
#endif
case ECL_FFI_INT:
case ECL_FFI_LONG:
@ -57,7 +57,7 @@ ecl_fficall_push_arg(union ecl_ffi_values *data, enum ecl_ffi_tag type)
case ECL_FFI_CSTRING:
case ECL_FFI_OBJECT:
i = data->i;
INT:
INT_ECL:
ecl_fficall_align(sizeof(int));
ecl_fficall_push_int(i);
break;
@ -209,22 +209,22 @@ ecl_dynamic_callback_execute(cl_object cbk_info, char *arg_buffer)
ecl_foreign_data_set_elt(&output, tag, result);
switch (tag) {
case ECL_FFI_CHAR: i = output.c; goto INT;
case ECL_FFI_UNSIGNED_CHAR: i = output.uc; goto INT;
case ECL_FFI_BYTE: i = output.b; goto INT;
case ECL_FFI_UNSIGNED_BYTE: i = output.ub; goto INT;
case ECL_FFI_CHAR: i = output.c; goto INT_ECL;
case ECL_FFI_UNSIGNED_CHAR: i = output.uc; goto INT_ECL;
case ECL_FFI_BYTE: i = output.b; goto INT_ECL;
case ECL_FFI_UNSIGNED_BYTE: i = output.ub; goto INT_ECL;
#ifdef ecl_uint8_t
case ECL_FFI_INT8_T: i = output.i8; goto INT;
case ECL_FFI_UINT8_T: i = output.u8; goto INT;
case ECL_FFI_INT8_T: i = output.i8; goto INT_ECL;
case ECL_FFI_UINT8_T: i = output.u8; goto INT_ECL;
#endif
#ifdef ecl_uint16_t
case ECL_FFI_INT16_T:
#endif
case ECL_FFI_SHORT: i = output.s; goto INT;
case ECL_FFI_SHORT: i = output.s; goto INT_ECL;
#ifdef ecl_uint16_t
case ECL_FFI_UINT16_T:
#endif
case ECL_FFI_UNSIGNED_SHORT: i = output.us; goto INT;
case ECL_FFI_UNSIGNED_SHORT: i = output.us; goto INT_ECL;
case ECL_FFI_POINTER_VOID:
case ECL_FFI_OBJECT:
case ECL_FFI_CSTRING:
@ -237,7 +237,7 @@ ecl_dynamic_callback_execute(cl_object cbk_info, char *arg_buffer)
case ECL_FFI_LONG:
case ECL_FFI_UNSIGNED_LONG:
i = output.i;
INT:
INT_ECL:
#ifdef _MSC_VER
__asm mov eax,i
#else

4
src/c/numbers/number_equalp.d
View file

@ -102,10 +102,10 @@ ecl_number_equalp(cl_object x, cl_object y)
}
case t_singlefloat:
dx = ecl_single_float(x);
goto FLOAT;
goto FLOAT_ECL;
case t_doublefloat:
dx = ecl_double_float(x);
FLOAT:
FLOAT_ECL:
switch (ecl_t_of(y)) {
case t_fixnum:
return double_fix_compare(ecl_fixnum(y), dx) == 0;