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

  Server: rpm5.org                         Name:   Jeff Johnson
  Root:   /v/rpm/cvs                       Email:  j...@rpm5.org
  Module: rpm                              Date:   11-May-2016 20:51:27
  Branch: rpm-5_4                          Handle: 2016051118512700

  Modified files:           (Branch: rpm-5_4)
    rpm/rpmdb               rpmdb.c

  Log:
    - add L10N_SQL #define

  Summary:
    Revision    Changes     Path
    1.392.2.32  +5  -5      rpm/rpmdb/rpmdb.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/rpmdb.c
  ============================================================================
  $ cvs diff -u -r1.392.2.31 -r1.392.2.32 rpmdb.c
  --- rpm/rpmdb/rpmdb.c 19 Apr 2016 13:10:10 -0000      1.392.2.31
  +++ rpm/rpmdb/rpmdb.c 11 May 2016 18:51:27 -0000      1.392.2.32
  @@ -667,7 +667,7 @@
       return rc;
   }
   
  -#ifdef       NOTYET          /* XXX mixed {bdb,sqlite3} dbenv issues w 
db-6.1.19 */
  +#ifdef       L10N_SQL        /* XXX mixed {bdb,sqlite3} dbenv issues w 
db-6.1.19 */
   static const char l10n_sql_init[] = "\
   CREATE TABLE IF NOT EXISTS l10n (\n\
     k     TEXT UNIQUE PRIMARY KEY NOT NULL,\n\
  @@ -743,7 +743,7 @@
       fn = _free(fn);
       return rc;
   }
  -#endif       /* NOTYET */
  +#endif       /* L10N_SQL */
   
   /**
    * Write added/removed header info.
  @@ -764,12 +764,12 @@
       /* Add/remove stamp file in %{?_hrmib_path} (if configured). */
       xx = rpmdbExportHR_MIB(db, h, adding);
   
  -#ifdef       NOTYET          /* XXX mixed {bdb,sqlite3} dbenv issues w 
db-6.1.19 */
  +#ifdef       L10N_SQL        /* XXX mixed {bdb,sqlite3} dbenv issues w 
db-6.1.19 */
       /* Add localization %{?__l10ndir} sqlite3 database (if configured). */
       if (adding)
        xx = rpmdbExportL10N_SQL(db, h, adding);
  -#endif
  -(void)xx;
  +#endif       /* L10N_SQL */
  +    (void)xx;
   
       return rc;
   }
  @@ .
______________________________________________________________________
RPM Package Manager                                    http://rpm5.org
CVS Sources Repository                                rpm-cvs@rpm5.org

Reply via email to