diff options
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/emulator/beam/global.h | 3 | ||||
| -rw-r--r-- | erts/etc/win32/msys_tools/vc/cc.sh | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/erts/emulator/beam/global.h b/erts/emulator/beam/global.h index d5b74efd98..e9b5e7e0e5 100644 --- a/erts/emulator/beam/global.h +++ b/erts/emulator/beam/global.h @@ -399,6 +399,9 @@ extern Eterm erts_ddll_monitor_driver(Process *p, typedef struct binary { ERTS_INTERNAL_BINARY_FIELDS long orig_size; +#if SIZEOF_LONG < SIZEOF_VOID_P + long _pad; +#endif char orig_bytes[1]; /* to be continued */ } Binary; diff --git a/erts/etc/win32/msys_tools/vc/cc.sh b/erts/etc/win32/msys_tools/vc/cc.sh index d67c746eb8..6c1b20a003 100644 --- a/erts/etc/win32/msys_tools/vc/cc.sh +++ b/erts/etc/win32/msys_tools/vc/cc.sh @@ -257,7 +257,8 @@ for x in $SOURCES; do if test `grep -v $x $MSG_FILE | grep -c '#line'` != "0"; then o=`echo $x | sed 's,.*/,,' | sed 's,\.cp*$,.o,'` echo -n $o':' - cat $MSG_FILE | grep '#line' | grep -v $x | awk -F\" '{printf("%s\n",$2)}' | sort -u | grep -v " " | xargs -n 1 win2msys_path.sh | awk '{printf("\\\n %s ",$0)}' +# cat $MSG_FILE | grep '#line' | grep -v $x | awk -F\" '{printf("%s\n",$2)}' | sort -u | grep -v " " | xargs -n 1 win2msys_path.sh | awk '{printf("\\\n %s ",$0)}' + cat $MSG_FILE | grep '#line' | grep -v $x | awk -F\" '{printf("%s\n",$2)}' | sort -u | grep -v " " | sed 's,^\([A-Za-z]\):[\\/]*,/\1/,;s,\\\\*,/,g'| awk '{printf("\\\n %s ",$0)}' echo echo after_sed=`date '+%s'` |