From: John L. <mov...@us...> - 2002-05-06 18:08:06
|
Update of /cvsroot/oprofile/oprofile/libdb In directory usw-pr-cvs1:/tmp/cvs-serv5322/libdb Modified Files: Makefile.in db.h Log Message: Mega-patch ! It builds now, but there are still some ... troubles Also some stuff is not yet complete Index: Makefile.in =================================================================== RCS file: /cvsroot/oprofile/oprofile/libdb/Makefile.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Makefile.in 24 Apr 2002 17:59:31 -0000 1.2 +++ Makefile.in 6 May 2002 18:00:32 -0000 1.3 @@ -1,22 +1,22 @@ -AR=ar +include ../make.common -CFLAGS=-Wall -Wstrict-prototypes -pipe -Wunused -W -Wshadow -Wmissing-prototypes -Winline @CFLAGS@ -CFLAGS+=-DNDEBUG +# disabled db-test etc. for now + +HEADERS=db.h + +SOURCES=db-manage.c db-insert.c db-travel.c db-debug.c -.PHONY: clean +OBJECTS=db-manage.o db-insert.o db-travel.o db-debug.o -all: libdb.a db-test +TARGET=libdb.a +all: $(TARGET) +install: +uninstall: clean: - rm -rf *.o *~ .deps db-test libdb.a + rm -rf .deps $(OBJECTS) $(TARGET) -libdb.a: db-insert.o db-manage.o db-travel.o db-debug.o - rm -f $@ +$(TARGET): $(OBJECTS) $(AR) cr $@ $^ - -db-test: db-test.o libdb.a - $(CC) $(CFLAGS) $^ -o $@ - -ALL_SOURCES = db-insert.c db-manage.c db-travel.c db-debug.c db-test.c - -include ../Rules.make + +include ../make.deps Index: db.h =================================================================== RCS file: /cvsroot/oprofile/oprofile/libdb/db.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- db.h 1 May 2002 19:56:18 -0000 1.3 +++ db.h 6 May 2002 18:00:32 -0000 1.4 @@ -14,10 +14,6 @@ #include <assert.h> #include <stddef.h> -#ifndef fd_t -#define fd_t int -#endif - /** the type of a key */ typedef unsigned int db_key_t; /** the type of an information in the database */ @@ -73,7 +69,7 @@ */ typedef struct { db_page_t * page_base; /*< base memory area of the page */ - fd_t fd; /*< file descriptor of the maped mem */ + int fd; /*< file descriptor of the maped mem */ void * base_memory; /*< base memory of the maped memory */ db_descr_t * descr; /*< the current state of database */ size_t sizeof_header; /*< from base_memory to descr */ |