From daf02cb1cc4b38763ba4bcc2c3618e58705cbe1a Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Wed, 1 Sep 2004 17:08:45 +0000 Subject: [PATCH] Sync noinst_HEADERS due to removed rset header files so we can build. --- include/Makefile.am | 6 ++---- include/rsisamd.h | 50 -------------------------------------------------- include/rsprox.h | 45 --------------------------------------------- 3 files changed, 2 insertions(+), 99 deletions(-) delete mode 100644 include/rsisamd.h delete mode 100644 include/rsprox.h diff --git a/include/Makefile.am b/include/Makefile.am index e7e3043..7a8d48a 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1,10 +1,8 @@ -# $Id: Makefile.am,v 1.13 2004-08-25 09:23:35 adam Exp $ +# $Id: Makefile.am,v 1.14 2004-09-01 17:08:45 adam Exp $ noinst_HEADERS = bfile.h bset.h charmap.h d1_attset.h d1_map.h \ data1.h dfa.h dict.h direntz.h isam-codec.h isamb.h isamc.h isamg.h \ isams.h mfile.h passwddb.h recctrl.h \ -rsbetween.h rsbool.h rset.h rsisamb.h rsisamc.h \ -rsisams.h rsmultior.h rsnull.h rsprox.h rstemp.h set.h \ -sortidx.h str.h zebra-lock.h zebramap.h zebrautl.h \ +rset.h set.h sortidx.h str.h zebra-lock.h zebramap.h zebrautl.h \ zebra_xpath.h SUBDIRS = idzebra diff --git a/include/rsisamd.h b/include/rsisamd.h deleted file mode 100644 index 097d6ed..0000000 --- a/include/rsisamd.h +++ /dev/null @@ -1,50 +0,0 @@ -/* $Id: rsisamd.h,v 1.3 2002-08-02 19:26:55 adam Exp $ - Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002 - Index Data Aps - -This file is part of the Zebra server. - -Zebra is free software; you can redistribute it and/or modify it under -the terms of the GNU General Public License as published by the Free -Software Foundation; either version 2, or (at your option) any later -version. - -Zebra is distributed in the hope that it will be useful, but WITHOUT ANY -WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -for more details. - -You should have received a copy of the GNU General Public License -along with Zebra; see the file LICENSE.zebra. If not, write to the -Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA -02111-1307, USA. -*/ - - - -#ifndef RSET_ISAMD_H -#define RSET_ISAMD_H - -#include -#include - -#ifdef __cplusplus -extern "C" { -#endif - -extern const struct rset_control *rset_kind_isamd; - -typedef struct rset_isamd_parms -{ - ISAMD is; -/* ISAMD_P pos; */ - char dictentry[ISAMD_MAX_DICT_LEN+1]; - int dictlen; - RSET_TERM rset_term; -} rset_isamd_parms; - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/include/rsprox.h b/include/rsprox.h deleted file mode 100644 index 9b86db7..0000000 --- a/include/rsprox.h +++ /dev/null @@ -1,45 +0,0 @@ -/* $Id: rsprox.h,v 1.3 2004-09-01 15:01:32 heikki Exp $ - Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004 - Index Data Aps - -This file is part of the Zebra server. - -Zebra is free software; you can redistribute it and/or modify it under -the terms of the GNU General Public License as published by the Free -Software Foundation; either version 2, or (at your option) any later -version. - -Zebra is distributed in the hope that it will be useful, but WITHOUT ANY -WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -for more details. - -You should have received a copy of the GNU General Public License -along with Zebra; see the file LICENSE.zebra. If not, write to the -Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA -02111-1307, USA. -*/ - -#ifndef RSET_PROX_H -#define RSET_PROX_H - -#include - -#ifdef __cplusplus -extern "C" { -#endif - -#error "Do not use rsprox.h, it is all in rset.h" - -RSET rsprox_create( NMEM nmem, int key_size, - int (*cmp)(const void *p1, const void *p2), - int (*getseq)(const void *p), - int rset_no, RSET *rset, - int ordered, int exclusion, - int relation, int distance); - -#ifdef __cplusplus -} -#endif - -#endif -- 1.7.10.4