ObjFW  Check-in [23b09a2f41]

Overview
Comment:Fix compilation on OpenIndiana
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 23b09a2f41a85cb981ccd662a4bff08b57620c29d968302d5d6a347e4106928a
User & Date: js on 2018-10-28 11:57:51
Other Links: manifest | tags
Context
2018-10-28
14:53
Use .init_array instead of .ctors on Solaris check-in: 12db1e2cc2 user: js tags: trunk
11:57
Fix compilation on OpenIndiana check-in: 23b09a2f41 user: js tags: trunk
2018-10-27
22:38
Only use dllexport when we have no shared library check-in: 5f6072bf22 user: js tags: trunk
Changes

Modified src/socket.m from [00380c738c] to [fd66b3751b].

543
544
545
546
547
548
549
550
551


552
553
554
555
556
557
558
559
560
561
562
563


564
565
566
567
568
569
570
543
544
545
546
547
548
549


550
551
552
553
554
555
556
557
558
559
560
561


562
563
564
565
566
567
568
569
570







-
-
+
+










-
-
+
+







		maxZerosCount = zerosCount;
	}

	if (maxZerosCount >= 2) {
		for (int_fast8_t i = 0; i < maxZerosStart; i += 2) {
			[string appendFormat:
			    (first ? @"%x" : @":%x"),
			    (addrIn6->sin6_addr.s6_addr[i] << 8) |
			    addrIn6->sin6_addr.s6_addr[i + 1]];
			    (addrIn6->sin6_addr.s6_addr[(uint_fast8_t)i] << 8) |
			    addrIn6->sin6_addr.s6_addr[(uint_fast8_t)i + 1]];
			first = false;
		}

		[string appendString: @"::"];
		first = true;

		for (int_fast8_t i = maxZerosStart + (maxZerosCount * 2);
		    i < 16; i += 2) {
			[string appendFormat:
			    (first ? @"%x" : @":%x"),
			    (addrIn6->sin6_addr.s6_addr[i] << 8) |
			    addrIn6->sin6_addr.s6_addr[i + 1]];
			    (addrIn6->sin6_addr.s6_addr[(uint_fast8_t)i] << 8) |
			    addrIn6->sin6_addr.s6_addr[(uint_fast8_t)i + 1]];
			first = false;
		}
	} else {
		for (uint_fast8_t i = 0; i < 16; i += 2) {
			[string appendFormat:
			    (first ? @"%x" : @":%x"),
			    (addrIn6->sin6_addr.s6_addr[i] << 8) |