projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Several updates for the changes of hit count datatype from int
[idzebra-moved-to-github.git]
/
include
/
dfa.h
diff --git
a/include/dfa.h
b/include/dfa.h
index
5416c13
..
345109d
100644
(file)
--- a/
include/dfa.h
+++ b/
include/dfa.h
@@
-1,6
+1,6
@@
-/* $Id: dfa.h,v 1.10 2002-08-02 19:26:55 adam Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
- Index Data Aps
+/* $Id: dfa.h,v 1.12 2005-01-15 21:45:42 adam Exp $
+ Copyright (C) 1995-2005
+ Index Data ApS
This file is part of the Zebra server.
This file is part of the Zebra server.
@@
-20,17
+20,15
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
02111-1307, USA.
*/
02111-1307, USA.
*/
-
-
#ifndef DFA_H
#define DFA_H
#include <bset.h>
#ifndef DFA_H
#define DFA_H
#include <bset.h>
-#include <set.h>
+#include <dfaset.h>
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include <yaz/yconfig.h>
+
+YAZ_BEGIN_CDECL
struct DFA_tran {
unsigned char ch[2]; /* transition on ch[0] <= c <= ch[1] to */
struct DFA_tran {
unsigned char ch[2]; /* transition on ch[0] <= c <= ch[1] to */
@@
-48,7
+46,7
@@
struct DFA_state {
struct DFA_state *next; /* next entry in free/unmarked/marked list */
struct DFA_state *link; /* link to next entry in hash chain */
struct DFA_tran *trans; /* transition list */
struct DFA_state *next; /* next entry in free/unmarked/marked list */
struct DFA_state *link; /* link to next entry in hash chain */
struct DFA_tran *trans; /* transition list */
- Set set; /* set of positions (important nfa states) */
+ DFASet set; /* set of positions (important nfa states) */
short no; /* no of this state */
short tran_no; /* no of transitions to other states */
short rule_no; /* if non-zero, this holds accept rule no */
short no; /* no of this state */
short tran_no; /* no of transitions to other states */
short rule_no; /* if non-zero, this holds accept rule no */
@@
-101,8
+99,6
@@
extern unsigned short
#define DFA_ERR_LP 2
#define DFA_ERR_RP 3
#define DFA_ERR_LP 2
#define DFA_ERR_RP 3
-#ifdef __cplusplus
-}
-#endif
+YAZ_END_CDECL
#endif
#endif