Author: glen Date: Mon Feb 22 17:34:38 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- apply fc patch: nss_db-2.2-glibc.patch:
Avoid macro expansion if open() is a macro.
revision 1.1
date: 2007/08/14 14:15:04; author: nalin; state: Exp;
adapt to open-is-a-macro cases
---- Files affected:
packages/nss_db:
nss_db-db41.patch (1.1 -> 1.2)
---- Diffs:
================================================================
Index: packages/nss_db/nss_db-db41.patch
diff -u packages/nss_db/nss_db-db41.patch:1.1
packages/nss_db/nss_db-db41.patch:1.2
--- packages/nss_db/nss_db-db41.patch:1.1 Sat Apr 3 00:00:56 2004
+++ packages/nss_db/nss_db-db41.patch Mon Feb 22 18:34:33 2010
@@ -1,13 +1,14 @@
---- nss_db-2.2.3pre1/src/db-compat.c.orig 2001-04-30 03:07:41.000000000
+0200
-+++ nss_db-2.2.3pre1/src/db-compat.c 2004-04-02 23:57:06.562464288 +0200
+--- nss_db-2.2.3pre1/src/db-compat.c 2010-02-22 19:32:31.371616603 +0200
++++ nss_db-2.2.3pre1/src/db-compat.c 2010-02-22 19:32:31.371616603 +0200
@@ -39,7 +39,11 @@
if (err)
return err;
+- err = db->open (db, file, NULL, type, flags, mode);
+#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR
>= 1))
-+ err = db->open (db, NULL, file, NULL, type, flags, mode);
++ err = (db->open) (db, NULL, file, NULL, type, flags, mode);
+#else
- err = db->open (db, file, NULL, type, flags, mode);
++ err = (db->open) (db, file, NULL, type, flags, mode);
+#endif
if (err)
{
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nss_db/nss_db-db41.patch?r1=1.1&r2=1.2&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
