Comment 8 for bug 1218663

The patch in comment #4 changed.

The last is this

RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org Name: Jeff Johnson
  Root: /v/rpm/cvs Email: <email address hidden>
  Module: rpm Date: 30-Aug-2013 19:43:07
  Branch: rpm-5_4 Handle: 2013083017430600

  Modified files: (Branch: rpm-5_4)
    rpm/rpmio rpmgit.c rpmgit.h

  Log:
    - fix: avoid symbol collisions on OopenSolaris AND be conformant with
    C 2011 AND mark tenative rpmgit symbols in a developing API
    consistently.

  Summary:
    Revision Changes Path
    2.1.2.34 +12 -12 rpm/rpmio/rpmgit.c
    2.1.2.19 +6 -6 rpm/rpmio/rpmgit.h
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmgit.c
  ============================================================================
  $ cvs diff -u -r2.1.2.33 -r2.1.2.34 rpmgit.c
  --- rpm/rpmio/rpmgit.c 30 Aug 2013 14:34:42 -0000 2.1.2.33
  +++ rpm/rpmio/rpmgit.c 30 Aug 2013 17:43:06 -0000 2.1.2.34
  @@ -190,10 +190,10 @@
   fprintf(fp, " %s", _b);
   }

  -void rpmgitPrintSig(const char * msg, const void * _S, void * _fp)
  +void rpmgitPrintSig(const char * msg, const void * ___S, void * _fp)
   {
       FILE * fp = (_fp ? _fp : stderr);
  - const git_signature * S = _S;
  + const git_signature * S = ___S;
   assert(S != NULL);
   if (msg) fprintf(fp, "%s:", msg);
   fprintf(fp, " %s <%s>", S->name, S->email);
  @@ -206,10 +206,10 @@
   fprintf(fp, "\n");
   }

  -void rpmgitPrintIndex(void * _I, void * _fp)
  +void rpmgitPrintIndex(void * ___I, void * _fp)
   {
       FILE * fp = (FILE *) _fp;
  - git_index * I = (git_index *) _I;
  + git_index * I = (git_index *) ___I;
       unsigned Icnt;
       unsigned i;

  @@ -266,9 +266,9 @@
   }
   #endif

  -void rpmgitPrintTree(void * _T, void * _fp)
  +void rpmgitPrintTree(void * ___T, void * _fp)
   {
  - git_tree * T = (git_tree *) _T;
  + git_tree * T = (git_tree *) ___T;
       FILE * fp = (FILE *) _fp;
       unsigned Tcnt;
       unsigned i;
  @@ -305,10 +305,10 @@
       }
   }

  -void rpmgitPrintCommit(rpmgit git, void * Commit, void * _fp)
  +void rpmgitPrintCommit(rpmgit git, void * ___C, void * _fp)
   {
       FILE * fp = (FILE *) _fp;
  - git_commit * C = Commit;
  + git_commit * C = ___C;
       unsigned Pcnt;
       unsigned i;

  @@ -378,10 +378,10 @@

   }

  -void rpmgitPrintHead(rpmgit git, void * Header, void * _fp)
  +void rpmgitPrintHead(rpmgit git, void * ___H, void * _fp)
   {
       FILE * fp = (_fp ? _fp : stderr);
  - git_reference * H = (Header ? Header : git->H);
  + git_reference * H = (___H ? ___H : git->H);
       git_reference * Hresolved = NULL;
       int xx;

  @@ -412,10 +412,10 @@

   }

  -void rpmgitPrintRepo(rpmgit git, void * Repo, void * _fp)
  +void rpmgitPrintRepo(rpmgit git, void * ___R, void * _fp)
   {
       FILE * fp = (_fp ? _fp : stderr);
  - git_repository * R = Repo;
  + git_repository * R = ___R;
       const char * fn;

   if (_rpmgit_debug >= 0) return;
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmgit.h
  ============================================================================
  $ cvs diff -u -r2.1.2.18 -r2.1.2.19 rpmgit.h
  --- rpm/rpmio/rpmgit.h 30 Aug 2013 14:34:42 -0000 2.1.2.18
  +++ rpm/rpmio/rpmgit.h 30 Aug 2013 17:43:06 -0000 2.1.2.19
  @@ -168,25 +168,25 @@
   void rpmgitPrintTime(const char * msg, time_t _Ctime, void * _fp)
        /*@*/;

  -void rpmgitPrintSig(const char * msg, const void * _S, void * _fp)
  +void rpmgitPrintSig(const char * msg, const void * ___S, void * _fp)
        /*@*/;

  -void rpmgitPrintIndex(void * _I, void * _fp)
  +void rpmgitPrintIndex(void * ___I, void * _fp)
        /*@*/;

  -void rpmgitPrintTree(void * _T, void * _fp)
  +void rpmgitPrintTree(void * ___T, void * _fp)
        /*@*/;

  -void rpmgitPrintCommit(rpmgit git, void * Commit, void * _fp)
  +void rpmgitPrintCommit(rpmgit git, void * ___C, void * _fp)
        /*@*/;

   void rpmgitPrintTag(rpmgit git, void * _tag, void * _fp)
        /*@*/;

  -void rpmgitPrintHead(rpmgit git, void * Header, void * _fp)
  +void rpmgitPrintHead(rpmgit git, void * ___H, void * _fp)
        /*@*/;

  -void rpmgitPrintRepo(rpmgit git, void * Repo, void * _fp)
  +void rpmgitPrintRepo(rpmgit git, void * ___R, void * _fp)
        /*@*/;

   int rpmgitInit(rpmgit git)
  @@ .