Merge branch 'develop' of gitlab.com:embeddable-common-lisp/ecl into develop

This commit is contained in:
Daniel Kochmanski 2017-08-10 19:29:19 +02:00
commit 085ccd675c
4 changed files with 8 additions and 9 deletions

View file

@ -20,10 +20,9 @@ THREADS_OBJ=
!endif
!if "$(ECL_UNICODE)" != ""
ECL_UNICODE_FLAG=21
ECL_UCD_OBJ = ucd.obj ucd-0000.obj ucd-0016.obj \
ucd-0032.obj ucd-0048.obj ucd-0064.obj \
ucd-0080.obj ucd-0096.obj
ECL_UNICODE_FLAG=16
ECL_UCD_OBJ = ucd16.obj ucd16-0000.obj ucd16-0016.obj \
ucd16-0032.obj ucd16-0048.obj ucd16-0064.obj
!else
ECL_UNICODE_FLAG=0
!endif

View file

@ -198,7 +198,7 @@
#endif
#define strcasecmp _stricmp
#if defined(_MSC_VER) && (_MSC_VER < 1900)
#if defined(_MSC_VER) && (_MSC_VER < 1800)
#define isnan _isnan
#endif
#define finite _finite

View file

@ -155,11 +155,11 @@ typedef unsigned int cl_hashkey;
* The character type
*/
#ifdef ECL_UNICODE
#define ECL_CHAR_CODE_LIMIT 1114112 /* unicode character code limit */
#define ECL_CHAR_CODE_LIMIT 65536 /* unicode character code limit */
#else
#define ECL_CHAR_CODE_LIMIT 256 /* unicode character code limit */
#endif
typedef int ecl_character;
typedef short ecl_character;
typedef unsigned char ecl_base_char;
/*
@ -210,7 +210,7 @@ typedef unsigned char ecl_base_char;
/* #undef HAVE_FLOAT_COMPLEX */
/* Missing integer types */
#if _MSC_VER < 1900
#if _MSC_VER < 1600
typedef signed char int8_t;
typedef signed short int16_t;
typedef signed int int32_t;

View file

@ -28,7 +28,7 @@
#include <setjmp.h> /* setjmp and buffers */
#include <stdio.h> /* FILE */
/* Microsoft VC++ does not have va_copy() */
#if ( defined(_MSC_VER) && (_MSC_VER < 1900) ) || !defined(va_copy)
#if ( defined(_MSC_VER) && (_MSC_VER < 1800) ) || !defined(va_copy)
#define va_copy(dst, src) \
((void) memcpy(&(dst), &(src), sizeof(va_list)))
#endif