"wireshark" and wireshark-devel" ports: needed to apply patch to packet-gluster.h to build?

[Kennedy, Smith (Wireless Architect)]

Hello,

When I recently updated my wireshark port, the build failed.  The trace in my shell where the error occurred was this:

> In file included from packet-gluster_cli.c:43:
> ./packet-gluster.h:359:2: error: expected '}'
>         DT_UNKNOWN = 0,
>         ^
> /usr/include/sys/dirent.h:126:21: note: expanded from macro 'DT_UNKNOWN'
> #define DT_UNKNOWN       0
>                          ^
> ./packet-gluster.h:358:26: note: to match this '{'
> enum gluster_entry_types {
>                          ^
> In file included from packet-gluster_pmap.c:43:
> ./packet-gluster.h:359:2: error: expected '}'
>         DT_UNKNOWN = 0,
>         ^
> /usr/include/sys/dirent.h:126:21: note: expanded from macro 'DT_UNKNOWN'
> #define DT_UNKNOWN       0
>                          ^
> ./packet-gluster.h:358:26: note: to match this '{'
> enum gluster_entry_types {
>                          ^
> 2 warnings and 1 error generated.
> 2 warnings and 1 error generated.
> make[5]: *** [libdissectors_la-packet-gluster_cli.lo] Error 1
> make[5]: *** Waiting for unfinished jobs....
> make[5]: *** [libdissectors_la-packet-gluster_pmap.lo] Error 1

I fixed it by adding the following patch to packet-gluster.h:

> --- packet-gluster.h	2013-10-15 21:49:15.000000000 -0600
> +++ packet-gluster-modified.h	2013-10-15 21:48:38.000000000 -0600
> @@ -355,6 +355,33 @@
>  };
>  
>  /* dir-entry types from libglusterfs/src/compat.h */
> +#ifdef DT_UNKNOWN
> +#undef DT_UNKNOWN
> +#endif
> +#ifdef DT_FIFO
> +#undef DT_FIFO
> +#endif
> +#ifdef DT_CHR
> +#undef DT_CHR
> +#endif
> +#ifdef DT_DIR
> +#undef DT_DIR
> +#endif
> +#ifdef DT_BLK
> +#undef DT_BLK
> +#endif
> +#ifdef DT_REG
> +#undef DT_REG
> +#endif
> +#ifdef DT_LNK
> +#undef DT_LNK
> +#endif
> +#ifdef DT_SOCK
> +#undef DT_SOCK
> +#endif
> +#ifdef DT_WHT
> +#undef DT_WHT
> +#endif
>  enum gluster_entry_types {
>  	DT_UNKNOWN = 0,
>  	DT_FIFO = 1,

I don't know if this is a problem that others are seeing, but I wanted to report it.  I can file a ticket in Trac if that would be better than posting here.

Smith

/**
    Smith Kennedy
    Hewlett-Packard Co.
*/