- jbj: poptint.h: add poptSubstituteHelpI18N() to bury the ABI hack.

1 files changed, 10 insertions, 0 deletions

diff --git a/poptint.h b/poptint.h
index 2b2d6b6..cd56b9c 100644
--- a/poptint.h
+++ b/poptint.h
@@ -45,17 +45,27 @@ typedef struct {
 /** \ingroup popt
  * A union to simplify opt->arg access without casting.
  */
+/*@-exporttype -fielduse@*/
 typedef union poptArg_u {
+/*@shared@*/
     void * ptr;
     int * intp;
     long * longp;
     const char ** argv;
     poptCallbackType cb;
+/*@shared@*/
     poptOption opt;
 } poptArg;
+/*@=exporttype =fielduse@*/
 
 #define	poptArgType(opt)	((opt)->argInfo & POPT_ARG_MASK)
 
+/* XXX sick hack to preserve pretense of a popt-1.x ABI. */
+#define	poptSubstituteHelpI18N(opt) \
+  { /*@-observertrans@*/ \
+    if ((opt) == poptHelpOptions) (opt) = poptHelpOptionsI18N; \
+    /*@=observertrans@*/ }
+
 struct optionStackEntry {
     int argc;
 /*@only@*/ /*@null@*/