Merge branch 'freebsd-up' of https://github.com/myfreeweb/zig into freebsd2

2018-11-19 17:24:41 -05:00
parent 703c6684d1 f3bc1c38bf
commit 9493738e54
30 changed files with 1757 additions and 67 deletions
--- a/src/target.cpp
+++ b/src/target.cpp
@@ -738,6 +738,7 @@ uint32_t target_c_type_size_in_bits(const ZigTarget *target, CIntType id) {
        case OsLinux:
        case OsMacOSX:
        case OsZen:
+        case OsFreeBSD:
        case OsOpenBSD:
            switch (id) {
                case CIntTypeShort:
@@ -774,7 +775,6 @@ uint32_t target_c_type_size_in_bits(const ZigTarget *target, CIntType id) {
        case OsAnanas:
        case OsCloudABI:
        case OsDragonFly:
-        case OsFreeBSD:
        case OsIOS:
        case OsKFreeBSD:
        case OsLv2: