> This is Mark Benjamin's GTK work. It builds for GTK, with warnings. It > does not build for RISC OS. The Amiga frontend conflicts loads when > merged to trunk, so all bets are off there.
I'm assuming the conflicts are sorted, as the message below this one is an svnmerge. With that in mind, these two entries need adding to the enum in amiga/gui.h above GID_LAST: GID_SHOWALL GID_CASE It still doesn't compile, build failures attached. Regards Chris
In file included from utils/container.c:40: ./utils/container.h:33: error: expected declaration specifiers or '...' before 'u_int32_t' ./utils/container.h:45: warning: type defaults to 'int' in declaration of 'u_int32_t' ./utils/container.h:45: error: expected ';', ',' or ')' before 'datalen' utils/container.c:44:22: warning: sys/mman.h: No such file or directory utils/container.c:49: error: expected specifier-qualifier-list before 'u_int32_t' utils/container.c:56: error: expected specifier-qualifier-list before 'u_int32_t' utils/container.c:87: warning: type defaults to 'int' in declaration of 'u_int32_t' utils/container.c:87: error: expected ';', ',' or ')' before 'offset' utils/container.c: In function 'container_open': utils/container.c:120: error: 'struct container_header' has no member named 'magic' utils/container.c:123: error: 'struct container_header' has no member named 'magic' utils/container.c:123: warning: implicit declaration of function 'ntohl' utils/container.c:123: error: 'struct container_header' has no member named 'magic' utils/container.c:125: error: 'struct container_header' has no member named 'parser' utils/container.c:128: error: 'struct container_header' has no member named 'parser' utils/container.c:128: error: 'struct container_header' has no member named 'parser' utils/container.c:130: error: 'struct container_header' has no member named 'name' utils/container.c:133: error: 'struct container_header' has no member named 'author' utils/container.c:137: error: 'struct container_header' has no member named 'diroffset' utils/container.c:140: error: 'struct container_header' has no member named 'diroffset' utils/container.c:140: error: 'struct container_header' has no member named 'diroffset' utils/container.c:142: error: 'struct container_header' has no member named 'magic' utils/container.c:142: error: 'struct container_header' has no member named 'parser' utils/container.c: In function 'container_process': utils/container.c:155: error: 'u_int32_t' undeclared (first use in this function) utils/container.c:155: error: (Each undeclared identifier is reported only once utils/container.c:155: error: for each function it appears in.) utils/container.c:155: error: expected ';' before 'start' utils/container.c:158: warning: implicit declaration of function 'mmap' utils/container.c:158: error: 'struct container_header' has no member named 'diroffset' utils/container.c:158: error: 'PROT_READ' undeclared (first use in this function) utils/container.c:158: error: 'MAP_PRIVATE' undeclared (first use in this function) utils/container.c:159: warning: implicit declaration of function 'fileno' utils/container.c:159: warning: assignment makes pointer from integer without a cast utils/container.c:167: error: 'struct container_header' has no member named 'diroffset' utils/container.c:176: error: 'start' undeclared (first use in this function) utils/container.c:177: error: 'len' undeclared (first use in this function) utils/container.c:178: error: 'flags1' undeclared (first use in this function) utils/container.c:179: error: 'flags2' undeclared (first use in this function) utils/container.c:181: warning: implicit declaration of function 'container_add_to_dir' utils/container.c: At top level: utils/container.c:204: error: expected declaration specifiers or '...' before 'u_int32_t' utils/container.c: In function 'container_get': utils/container.c:216: error: 'size' undeclared (first use in this function) utils/container.c:216: error: 'const struct container_dirent' has no member named 'len' utils/container.c:218: error: 'const struct container_dirent' has no member named 'startoffset' utils/container.c: In function 'container_get_name': utils/container.c:243: error: 'struct container_header' has no member named 'name' utils/container.c: In function 'container_get_author': utils/container.c:248: error: 'struct container_header' has no member named 'author' utils/container.c: In function 'container_write_dir': utils/container.c:256: error: 'u_int32_t' undeclared (first use in this function) utils/container.c:256: error: expected ';' before 'tmp' utils/container.c:264: error: 'tmp' undeclared (first use in this function) utils/container.c:264: warning: implicit declaration of function 'htonl' utils/container.c:264: error: 'struct container_dirent' has no member named 'startoffset' utils/container.c:265: error: 'struct container_dirent' has no member named 'len' utils/container.c:266: error: 'struct container_dirent' has no member named 'flags1' utils/container.c:267: error: 'struct container_dirent' has no member named 'flags2' utils/container.c: In function 'container_create': utils/container.c:294: error: 'struct container_header' has no member named 'parser' utils/container.c:295: error: 'struct container_header' has no member named 'name' utils/container.c:296: error: 'struct container_header' has no member named 'author' utils/container.c:301: error: 'struct container_header' has no member named 'parser' utils/container.c:304: error: 'struct container_header' has no member named 'name' utils/container.c:307: error: 'struct container_header' has no member named 'author' utils/container.c:311: error: 'struct container_header' has no member named 'diroffset' utils/container.c: At top level: utils/container.c:324: warning: type defaults to 'int' in declaration of 'u_int32_t' utils/container.c:324: error: expected ';', ',' or ')' before 'datalen' utils/container.c: In function 'container_close': utils/container.c:355: warning: implicit declaration of function 'munmap' utils/container.c:355: error: 'struct container_header' has no member named 'diroffset' gmake: *** [build-amiga-amiga/utils_container.o] Error 1
