[oprof-cvs] CVS: oprofile/libdb db_manage.c,1.7.2.1,1.7.2.2 db_test.c,1.8,1.8.2.1 odb_hash.h,1.3.2.1,1.3.2.2

[John L. <mov...@us...>]

Update of /cvsroot/oprofile/oprofile/libdb
In directory sc8-pr-cvs1:/tmp/cvs-serv29157/libdb

Modified Files:
      Tag: BRANCH_CALLGRAPH
	db_manage.c db_test.c odb_hash.h 
Log Message:
merge from HEAD


Index: db_manage.c
===================================================================
RCS file: /cvsroot/oprofile/oprofile/libdb/db_manage.c,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -u -p -d -r1.7.2.1 -r1.7.2.2
--- db_manage.c	13 Jun 2003 20:37:20 -0000	1.7.2.1
+++ db_manage.c	14 Sep 2003 23:57:04 -0000	1.7.2.2
@@ -13,6 +13,8 @@
 #include <stdlib.h>
 #include <sys/fcntl.h>
 #include <sys/mman.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 #include <unistd.h>
 #include <errno.h>
 #include <string.h>

Index: db_test.c
===================================================================
RCS file: /cvsroot/oprofile/oprofile/libdb/db_test.c,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -p -d -r1.8 -r1.8.2.1
--- db_test.c	3 Jun 2003 16:18:53 -0000	1.8
+++ db_test.c	14 Sep 2003 23:57:04 -0000	1.8.2.1
@@ -8,6 +8,8 @@
  * @author Philippe Elie
  */
 
+#include <sys/types.h>
+#include <sys/time.h>
 #include <sys/resource.h>
 #include <stdlib.h>
 #include <stdio.h>

Index: odb_hash.h
===================================================================
RCS file: /cvsroot/oprofile/oprofile/libdb/odb_hash.h,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -p -d -r1.3.2.1 -r1.3.2.2
--- odb_hash.h	13 Jun 2003 20:37:20 -0000	1.3.2.1
+++ odb_hash.h	14 Sep 2003 23:57:04 -0000	1.3.2.2
@@ -30,7 +30,7 @@ typedef odb_index_t odb_hash_mask_t;
  * goal is to get a O(1) amortized insert time. bucket factor must be a
  * power of two. FIXME: see big comment in odb_hash_add_node, you must
  * re-enable zeroing hash table if BUCKET_FACTOR > 2 (roughly exact, you
- * want to read the comment in odb_add_hash_node() if you tune this define)
+ * want to read the comment in odb_hash_add_node() if you tune this define)
  */
 #define BUCKET_FACTOR 1