[Apt-Rpm] 0.5.15lorg3.93 Solaris build issue

[Anders F Björklund]

David Halik wrote:

> Second, your patch was not completely the answer for me, but it was
> close. evrFlags_e was still being used a couple lines before it was 
> even
> being defined. I switched the usage to below the definition and that
> succesfully passes now:
>
> --- rpmevr.h    2007-09-19 15:46:32.265742000 -0400
> +++ /usr/local/include/rpm/rpmevr.h     2007-09-19 15:39:09.619640000 
> -0400
> @@ -6,6 +6,10 @@
>   * Structure(s) and routine(s) used for EVR parsing and comparison.
>   */
>
> +#ifdef __cplusplus
> +extern "C" {
> +#endif
> +
>  /**
>   */
>  /*@-exportlocal@*/
> @@ -15,12 +19,6 @@
>
>  typedef        /*@abstract@*/ struct EVR_s * EVR_t;
>
> -/**
> - * Dependency Attributes.
> - */
> -typedef        enum evrFlags_e rpmsenseFlags;
> -typedef        enum evrFlags_e evrFlags;
> -
>  /*@-matchfields@*/
>  enum evrFlags_e {
>  #if defined(_RPMEVR_INTERNAL)
> @@ -67,6 +65,9 @@
>  };
>  /*@=matchfields@*/
>
> +typedef        enum evrFlags_e rpmsenseFlags;
> +typedef        enum evrFlags_e evrFlags;
> +
>  #define        RPMSENSE_SENSEMASK      0x0e     /* Mask to get senses,
> ie serial, */
>                                           /* less, greater,
> equal.          */
>  #define        RPMSENSE_NOTEQUAL       (RPMSENSE_EQUAL ^
> RPMSENSE_SENSEMASK)
> @@ -117,10 +118,6 @@
>  #define        isErasePreReq(_x)       ((_x) & _ERASE_ONLY_MASK)
>  #endif /* _RPMEVR_INTERNAL */
>
> -#ifdef __cplusplus
> -extern "C" {
> -#endif
> -
>  /** \ingroup rpmds
>   * Segmented string compare.
>   * @param a            1st string
>
> So that's fixed.

LOL, this was my first patch - it got rejected/improved :-)
http://www.algonet.se/~afb/rpm/rpm-4.4.9-evrflags.patch

Good to hear that I wasn't all wrong in my assumptions,
and maybe we do need some Solaris test boxes with SunCC.

--anders