Update bootstrap source. Fix MSC build and prontf format %zd.

This commit is contained in:
David Brown 2016-08-23 18:26:55 +01:00
parent 3d356298cc
commit fcefd3c444
7 changed files with 32 additions and 22 deletions

View file

@ -16,16 +16,18 @@ typedef unsigned short int SYSTEM_CARD16;
typedef signed char SYSTEM_INT8; typedef signed char SYSTEM_INT8;
typedef unsigned char SYSTEM_CARD8; typedef unsigned char SYSTEM_CARD8;
#if (__SIZEOF_POINTER__ == 8) #if (__SIZEOF_POINTER__ == 8) || defined(_WIN64)
#if defined(_WIN64) #if defined(_WIN64)
typedef unsigned long long SYSTEM_ADDRESS; typedef unsigned long long size_t;
#else #else
typedef unsigned long SYSTEM_ADDRESS; typedef unsigned long size_t;
#endif #endif
#else #else
typedef unsigned int SYSTEM_ADDRESS; typedef unsigned int size_t;
#endif #endif
#define SYSTEM_ADDRESS size_t
#define _SIZE_T_DECLARED // For FreeBSD and OpenBSD:
void *memcpy(void *dest, const void *source, SYSTEM_ADDRESS size); void *memcpy(void *dest, const void *source, SYSTEM_ADDRESS size);

View file

@ -16,16 +16,18 @@ typedef unsigned short int SYSTEM_CARD16;
typedef signed char SYSTEM_INT8; typedef signed char SYSTEM_INT8;
typedef unsigned char SYSTEM_CARD8; typedef unsigned char SYSTEM_CARD8;
#if (__SIZEOF_POINTER__ == 8) #if (__SIZEOF_POINTER__ == 8) || defined(_WIN64)
#if defined(_WIN64) #if defined(_WIN64)
typedef unsigned long long SYSTEM_ADDRESS; typedef unsigned long long size_t;
#else #else
typedef unsigned long SYSTEM_ADDRESS; typedef unsigned long size_t;
#endif #endif
#else #else
typedef unsigned int SYSTEM_ADDRESS; typedef unsigned int size_t;
#endif #endif
#define SYSTEM_ADDRESS size_t
#define _SIZE_T_DECLARED // For FreeBSD and OpenBSD:
void *memcpy(void *dest, const void *source, SYSTEM_ADDRESS size); void *memcpy(void *dest, const void *source, SYSTEM_ADDRESS size);

View file

@ -16,16 +16,18 @@ typedef unsigned short int SYSTEM_CARD16;
typedef signed char SYSTEM_INT8; typedef signed char SYSTEM_INT8;
typedef unsigned char SYSTEM_CARD8; typedef unsigned char SYSTEM_CARD8;
#if (__SIZEOF_POINTER__ == 8) #if (__SIZEOF_POINTER__ == 8) || defined(_WIN64)
#if defined(_WIN64) #if defined(_WIN64)
typedef unsigned long long SYSTEM_ADDRESS; typedef unsigned long long size_t;
#else #else
typedef unsigned long SYSTEM_ADDRESS; typedef unsigned long size_t;
#endif #endif
#else #else
typedef unsigned int SYSTEM_ADDRESS; typedef unsigned int size_t;
#endif #endif
#define SYSTEM_ADDRESS size_t
#define _SIZE_T_DECLARED // For FreeBSD and OpenBSD:
void *memcpy(void *dest, const void *source, SYSTEM_ADDRESS size); void *memcpy(void *dest, const void *source, SYSTEM_ADDRESS size);

View file

@ -16,16 +16,18 @@ typedef unsigned short int SYSTEM_CARD16;
typedef signed char SYSTEM_INT8; typedef signed char SYSTEM_INT8;
typedef unsigned char SYSTEM_CARD8; typedef unsigned char SYSTEM_CARD8;
#if (__SIZEOF_POINTER__ == 8) #if (__SIZEOF_POINTER__ == 8) || defined(_WIN64)
#if defined(_WIN64) #if defined(_WIN64)
typedef unsigned long long SYSTEM_ADDRESS; typedef unsigned long long size_t;
#else #else
typedef unsigned long SYSTEM_ADDRESS; typedef unsigned long size_t;
#endif #endif
#else #else
typedef unsigned int SYSTEM_ADDRESS; typedef unsigned int size_t;
#endif #endif
#define SYSTEM_ADDRESS size_t
#define _SIZE_T_DECLARED // For FreeBSD and OpenBSD:
void *memcpy(void *dest, const void *source, SYSTEM_ADDRESS size); void *memcpy(void *dest, const void *source, SYSTEM_ADDRESS size);

View file

@ -16,16 +16,18 @@ typedef unsigned short int SYSTEM_CARD16;
typedef signed char SYSTEM_INT8; typedef signed char SYSTEM_INT8;
typedef unsigned char SYSTEM_CARD8; typedef unsigned char SYSTEM_CARD8;
#if (__SIZEOF_POINTER__ == 8) #if (__SIZEOF_POINTER__ == 8) || defined(_WIN64)
#if defined(_WIN64) #if defined(_WIN64)
typedef unsigned long long SYSTEM_ADDRESS; typedef unsigned long long size_t;
#else #else
typedef unsigned long SYSTEM_ADDRESS; typedef unsigned long size_t;
#endif #endif
#else #else
typedef unsigned int SYSTEM_ADDRESS; typedef unsigned int size_t;
#endif #endif
#define SYSTEM_ADDRESS size_t
#define _SIZE_T_DECLARED // For FreeBSD and OpenBSD:
void *memcpy(void *dest, const void *source, SYSTEM_ADDRESS size); void *memcpy(void *dest, const void *source, SYSTEM_ADDRESS size);

View file

@ -16,7 +16,7 @@ typedef unsigned short int SYSTEM_CARD16;
typedef signed char SYSTEM_INT8; typedef signed char SYSTEM_INT8;
typedef unsigned char SYSTEM_CARD8; typedef unsigned char SYSTEM_CARD8;
#if (__SIZEOF_POINTER__ == 8) #if (__SIZEOF_POINTER__ == 8) || defined(_WIN64)
#if defined(_WIN64) #if defined(_WIN64)
typedef unsigned long long size_t; typedef unsigned long long size_t;
#else #else

View file

@ -407,7 +407,7 @@ void writeConfigurationMod() {
fprintf(fd, " installdir* = '%s';\n", installdir); fprintf(fd, " installdir* = '%s';\n", installdir);
fprintf(fd, " staticLink* = '%s';\n", staticlink); fprintf(fd, " staticLink* = '%s';\n", staticlink);
fprintf(fd, "VAR\n"); fprintf(fd, "VAR\n");
fprintf(fd, " versionLong-: ARRAY %d OF CHAR;\n", strnlen(versionstring, 100)+1); fprintf(fd, " versionLong-: ARRAY %zd OF CHAR;\n", strnlen(versionstring, 100)+1);
fprintf(fd, "BEGIN\n"); fprintf(fd, "BEGIN\n");
fprintf(fd, " versionLong := '%s';\n", versionstring); fprintf(fd, " versionLong := '%s';\n", versionstring);
fprintf(fd, "END Configuration.\n"); fprintf(fd, "END Configuration.\n");