[MacPorts] #62132: libgcrypt @1.9.0 does not build on PPC Leopard, Mac OS X 10.5.8, because of "error: redefinition of typedef 'cipher_bulk_ops_t'"

[MacPorts]

#62132: libgcrypt @1.9.0 does not build on PPC Leopard, Mac OS X 10.5.8, because of
"error: redefinition of typedef 'cipher_bulk_ops_t'"
------------------------+-------------------------
  Reporter:  ballapete  |      Owner:  Schamschula
      Type:  defect     |     Status:  assigned
  Priority:  Normal     |  Milestone:
 Component:  ports      |    Version:  2.6.4
Resolution:             |   Keywords:  leopard
      Port:  libgcrypt  |
------------------------+-------------------------

Comment (by ballapete):

 Just checking my deeds. The sequence of including C header files end with:

 {{{
 . ../src/gcrypt-testapi.h
 . ./cipher-internal.h
 .. ././poly1305-internal.h
 ... ../src/types.h
 ... ../src/g10lib.h
 ... ../src/cipher.h
 .... ../src/../random/random.h
 ..... ../src/types.h
 ..... ../src/../random/../src/gcrypt-testapi.h
 .... ../src/cipher-proto.h
 ... ././bufhelp.h
 .... ././bithelp.h
 . ../src/cipher.h
 }}}

 which shows the effect of the patch. The pre-processed output (via `-E -dD
 -H` instead of `-c`) shows:

 {{{
  8360   # 135 "../src/cipher-proto.h"
  8361   typedef gcry_err_code_t (*gcry_cipher_setkey_t) (void *c,
  8362          const unsigned char *key,
  8363          unsigned keylen,
  8364          cipher_bulk_ops_t *bulk_ops);
  8365
 ...
  9049   # 99 "./cipher-internal.h"
 ...
  9078
  9079   typedef struct cipher_bulk_ops
  9080   {
  9081     void (*cfb_enc)(void *context, unsigned char *iv, void
 *outbuf_arg,
  9082       const void *inbuf_arg, size_t nblocks);
  9083     void (*cfb_dec)(void *context, unsigned char *iv, void
 *outbuf_arg,
  9084       const void *inbuf_arg, size_t nblocks);
  9085     void (*cbc_enc)(void *context, unsigned char *iv, void
 *outbuf_arg,
  9086       const void *inbuf_arg, size_t nblocks, int cbc_mac);
  9087     void (*cbc_dec)(void *context, unsigned char *iv, void
 *outbuf_arg,
  9088       const void *inbuf_arg, size_t nblocks);
  9089     void (*ctr_enc)(void *context, unsigned char *iv, void
 *outbuf_arg,
  9090       const void *inbuf_arg, size_t nblocks);
  9091     size_t (*ocb_crypt)(gcry_cipher_hd_t c, void *outbuf_arg,
  9092           const void *inbuf_arg, size_t nblocks, int encrypt);
  9093     size_t (*ocb_auth)(gcry_cipher_hd_t c, const void *abuf_arg,
 size_t nblocks);
  9094     void (*xts_crypt)(void *context, unsigned char *tweak, void
 *outbuf_arg,
  9095         const void *inbuf_arg, size_t nblocks, int encrypt);
  9096   } cipher_bulk_ops_t;
  9097   # 156 "./cipher-internal.h"
 }}}

 so the sequnce still is not correct. Could be I should not change
 `cipher/cipeher.c`…

-- 
Ticket URL: <https://trac.macports.org/ticket/62132#comment:5>
MacPorts <https://www.macports.org/>
Ports system for macOS