You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by jo...@apache.org on 2004/06/06 12:01:35 UTC
cvs commit: apr-util/dbm/sdbm sdbm_pair.h sdbm_private.h
jorton 2004/06/06 03:01:35
Modified: dbm/sdbm Tag: APU_0_9_BRANCH sdbm_pair.h sdbm_private.h
Log:
Backport from HEAD:
* dbm/sdbm/sdbm_private.h, dbm/sdbm/sdbm_pair.h: Move global but
private symbols into the apu__ namespace.
Revision Changes Path
No revision
No revision
1.5.2.2 +8 -8 apr-util/dbm/sdbm/sdbm_pair.h
Index: sdbm_pair.h
===================================================================
RCS file: /home/cvs/apr-util/dbm/sdbm/sdbm_pair.h,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -d -w -u -r1.5.2.1 -r1.5.2.2
--- sdbm_pair.h 13 Feb 2004 09:52:42 -0000 1.5.2.1
+++ sdbm_pair.h 6 Jun 2004 10:01:35 -0000 1.5.2.2
@@ -17,14 +17,14 @@
#define SDBM_PAIR_H
/* Mini EMBED (pair.c) */
-#define chkpage sdbm__chkpage
-#define delpair sdbm__delpair
-#define duppair sdbm__duppair
-#define fitpair sdbm__fitpair
-#define getnkey sdbm__getnkey
-#define getpair sdbm__getpair
-#define putpair sdbm__putpair
-#define splpage sdbm__splpage
+#define chkpage apu__sdbm_chkpage
+#define delpair apu__sdbm_delpair
+#define duppair apu__sdbm_duppair
+#define fitpair apu__sdbm_fitpair
+#define getnkey apu__sdbm_getnkey
+#define getpair apu__sdbm_getpair
+#define putpair apu__sdbm_putpair
+#define splpage apu__sdbm_splpage
int fitpair(char *, int);
void putpair(char *, apr_sdbm_datum_t, apr_sdbm_datum_t);
1.10.2.2 +4 -0 apr-util/dbm/sdbm/sdbm_private.h
Index: sdbm_private.h
===================================================================
RCS file: /home/cvs/apr-util/dbm/sdbm/sdbm_private.h,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.2
diff -d -w -u -r1.10.2.1 -r1.10.2.2
--- sdbm_private.h 13 Feb 2004 09:52:42 -0000 1.10.2.1
+++ sdbm_private.h 6 Jun 2004 10:01:35 -0000 1.10.2.2
@@ -63,6 +63,10 @@
int lckcnt; /* number of calls to sdbm_lock */
};
+
+#define sdbm_hash apu__sdbm_hash
+#define sdbm_nullitem apu__sdbm_nullitem
+
extern const apr_sdbm_datum_t sdbm_nullitem;
long sdbm_hash(const char *str, int len);