Index: utils/Makefile ================================================================== --- utils/Makefile +++ utils/Makefile @@ -1,7 +1,7 @@ include ../extra.mk - + SUBDIRS += ${OBJFW_NEW} \ ${OFARC} \ ${OFATALKCFG} \ ${OFDNS} \ ${OFHASH} \ Index: utils/ofatalkcfg/OFATalkCfg.m ================================================================== --- utils/ofatalkcfg/OFATalkCfg.m +++ utils/ofatalkcfg/OFATalkCfg.m @@ -19,10 +19,11 @@ # include #endif #ifdef HAVE_SYS_IOCTL_H # include #endif +#include "unistd.h" #import "OFApplication.h" #import "OFArray.h" #import "OFOptionsParser.h" #import "OFSocket.h" @@ -39,11 +40,15 @@ configureInterface(OFString *interface, uint16_t network, uint8_t node, uint8_t phase, uint16_t rangeStart, uint16_t rangeEnd) { struct ifreq request = { 0 }; struct sockaddr_at *sat; +#ifdef OF_LINUX struct atalk_netrange *nr; +#else + struct netrange *nr; +#endif int sock; if (interface.UTF8StringLength > IFNAMSIZ) { [OFStdErr writeFormat: @"%@: Interface name too long!\n", [OFApplication programName]]; @@ -53,11 +58,11 @@ strncpy(request.ifr_name, interface.UTF8String, IFNAMSIZ); sat = (struct sockaddr_at *)&request.ifr_addr; sat->sat_family = AF_APPLETALK; sat->sat_net = OFToBigEndian16(network); sat->sat_node = node; - nr = (struct atalk_netrange *)(void *)sat->sat_zero; + nr = (__typeof__(nr))(void *)sat->sat_zero; nr->nr_phase = phase; nr->nr_firstnet = OFToBigEndian16(rangeStart); nr->nr_lastnet = OFToBigEndian16(rangeEnd); if ((sock = socket(AF_APPLETALK, SOCK_DGRAM, 0)) < 0) { @@ -139,11 +144,11 @@ [OFApplication programName]]; [OFApplication terminateWithStatus: 1]; } if (networkString == nil) { - [OFStdErr writeFormat: @"%@: --netwwork not specified!\n", + [OFStdErr writeFormat: @"%@: --network not specified!\n", [OFApplication programName]]; [OFApplication terminateWithStatus: 1]; } @try { network = [networkString unsignedLongLongValueWithBase: 0];