More optimizations of the melm matching.

[idzebra-moved-to-github.git] / include / rsm_or.h

diff --git a/include/rsm_or.h b/include/rsm_or.h
index 7d96e85..3d64ef3 100644 (file)
--- a/include/rsm_or.h
+++ b/include/rsm_or.h
@@ -1,5 +1,5 @@
-/* $Id: rsm_or.h,v 1.7 2004-08-04 08:35:23 adam Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
+/* $Id: rsm_or.h,v 1.6.2.1 2006-08-14 10:38:56 adam Exp $
+   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
    Index Data Aps
 
 This file is part of the Zebra server.
@@ -15,9 +15,9 @@ 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.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 */
 
 
@@ -27,7 +27,9 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 #include <rset.h>
 
-YAZ_BEGIN_CDECL
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 extern const struct rset_control *rset_kind_m_or;
 
@@ -37,13 +39,15 @@ typedef struct rset_m_or_parms
     int     (*cmp)(const void *p1, const void *p2);
 
     ISAMC   isc;
-    ISAMC_P  *isam_positions;
+    ISAM_P  *isam_positions;
     RSET_TERM rset_term;
 
     int     no_isam_positions;
     int     no_save_positions;
 } rset_m_or_parms;
 
-YAZ_END_CDECL
+#ifdef __cplusplus
+}
+#endif
 
 #endif