colin
/
tripwire-open-source
mirror of https://github.com/Tripwire/tripwire-open-source.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix error registration in db subproject

This commit is contained in:
Brian Cox 2016-06-29 18:30:15 -07:00
parent 1a5a588f0d
commit c18af8953c
4 changed files with 55 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/db/Makefile.am
View File

@ -6,11 +6,11 @@ noinst_LIBRARIES = libdb.a
libdb_adir=.
libdb_a_SOURCES = \
blockfile.cpp blockrecordarray.cpp blockrecordfile.cpp \
db.cpp hierdatabase.cpp hierdbpath.cpp stddb.cpp
db.cpp dberrors.cpp hierdatabase.cpp hierdbpath.cpp stddb.cpp
libdb_a_HEADERS = \
block.h blockfile.h blockrecordarray.h blockrecordfile.h \
db.h hierdatabase.h hierdbnode.h hierdbpath.h stddb.h
db.h dberrors.h hierdatabase.h hierdbnode.h hierdbpath.h stddb.h
DEFS = @DEFS@ # This gets rid of the -I. so AM_CPPFLAGS must be more explicit

8
src/db/Makefile.in
View File

@ -111,8 +111,8 @@ am__v_AR_1 =
libdb_a_AR = $(AR) $(ARFLAGS)
libdb_a_LIBADD =
am_libdb_a_OBJECTS = blockfile.$(OBJEXT) blockrecordarray.$(OBJEXT) \
blockrecordfile.$(OBJEXT) db.$(OBJEXT) hierdatabase.$(OBJEXT) \
hierdbpath.$(OBJEXT) stddb.$(OBJEXT)
blockrecordfile.$(OBJEXT) db.$(OBJEXT) dberrors.$(OBJEXT) \
hierdatabase.$(OBJEXT) hierdbpath.$(OBJEXT) stddb.$(OBJEXT)
libdb_a_OBJECTS = $(am_libdb_a_OBJECTS)
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
@ -318,11 +318,11 @@ noinst_LIBRARIES = libdb.a
libdb_adir = .
libdb_a_SOURCES = \
blockfile.cpp blockrecordarray.cpp blockrecordfile.cpp \
db.cpp hierdatabase.cpp hierdbpath.cpp stddb.cpp
db.cpp dberrors.cpp hierdatabase.cpp hierdbpath.cpp stddb.cpp
libdb_a_HEADERS = \
block.h blockfile.h blockrecordarray.h blockrecordfile.h \
db.h hierdatabase.h hierdbnode.h hierdbpath.h stddb.h
db.h dberrors.h hierdatabase.h hierdbnode.h hierdbpath.h stddb.h
all: all-am

3
src/db/dberrors.cpp
View File

@ -36,8 +36,7 @@
//
#include "stddb.h"
#include "core/errortable.h"
#include "dberrors.h"
#include "hierdatabase.h"
TSS_BEGIN_ERROR_REGISTRATION( db )

48
src/db/dberrors.h Normal file
View File

@ -0,0 +1,48 @@
//
// The developer of the original code and/or files is Tripwire, Inc.
// Portions created by Tripwire, Inc. are copyright (C) 2000 Tripwire,
// Inc. Tripwire is a registered trademark of Tripwire, Inc. All rights
// reserved.
//
// This program is free software. The contents of this file are subject
// to the terms of the GNU General Public License as published by the
// Free Software Foundation; either version 2 of the License, or (at your
// option) any later version. You may redistribute it and/or modify it
// only in compliance with the GNU General Public License.
//
// This program is distributed in the hope that it will be useful.
// However, this program is distributed AS-IS WITHOUT ANY
// WARRANTY; INCLUDING THE IMPLIED WARRANTY OF MERCHANTABILITY OR FITNESS
// FOR A PARTICULAR PURPOSE. Please see the GNU General Public License
// for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
// USA.
//
// Nothing in the GNU General Public License or any other license to use
// the code or files shall permit you to use Tripwire's trademarks,
// service marks, or other intellectual property without Tripwire's
// prior written consent.
//
// If you have any questions, please contact Tripwire, Inc. at either
// info@tripwire.org or www.tripwire.org.
//
//
// Name....: dberrors.h
// Date....: 5/17/99
// Creator.: Matthew Brinkley (brinkley)
//
//
#ifndef __DBERRORS_H
#define __DBERRORS_H
#include "core/errortable.h"
TSS_DECLARE_ERROR_REGISTRATION( db )
#endif//__DBERRORS_H