projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Document . Remove if/endif section
[yaz-moved-to-github.git]
/
include
/
yaz
/
proto.h
diff --git
a/include/yaz/proto.h
b/include/yaz/proto.h
index
531610e
..
fcda11b
100644
(file)
--- a/
include/yaz/proto.h
+++ b/
include/yaz/proto.h
@@
-1,5
+1,5
@@
/* This file is part of the YAZ toolkit.
/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2008 Index Data.
+ * Copyright (C) 1995-2010 Index Data.
* All rights reserved.
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
* All rights reserved.
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
@@
-24,7
+24,6
@@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-/* $Id: proto.h,v 1.28 2007-12-16 11:08:50 adam Exp $ */
/**
* \file proto.h
/**
* \file proto.h
@@
-66,13
+65,17
@@
#include <yaz/z-charneg.h>
#include <yaz/z-mterm2.h>
#include <yaz/wrbuf.h>
#include <yaz/z-charneg.h>
#include <yaz/z-mterm2.h>
#include <yaz/wrbuf.h>
+#include <yaz/matchstr.h>
#include <yaz/zgdu.h>
#include <yaz/z-oclcui.h>
#include <yaz/marcdisp.h>
YAZ_BEGIN_CDECL
#include <yaz/zgdu.h>
#include <yaz/z-oclcui.h>
#include <yaz/marcdisp.h>
YAZ_BEGIN_CDECL
-#if 1
+/* Here are a lot of definitions that were defined in YAZ 1 and which
+ are still in use by some applications. We keep those to preserve
+ backwards compatibility.. They cause no harm.
+*/
#define Z_PRES_SUCCESS Z_PresentStatus_success
#define Z_PRES_PARTIAL_1 Z_PresentStatus_partial_1
#define Z_PRES_PARTIAL_2 Z_PresentStatus_partial_2
#define Z_PRES_SUCCESS Z_PresentStatus_success
#define Z_PRES_PARTIAL_1 Z_PresentStatus_partial_1
#define Z_PRES_PARTIAL_2 Z_PresentStatus_partial_2
@@
-122,7
+125,6
@@
YAZ_BEGIN_CDECL
#define Z_SortResultSetStatus_interim Z_SortResponse_interim
#define Z_SortResultSetStatus_unchanged Z_SortResponse_unchanged
#define Z_SortResultSetStatus_none Z_SortResponse_none
#define Z_SortResultSetStatus_interim Z_SortResponse_interim
#define Z_SortResultSetStatus_unchanged Z_SortResponse_unchanged
#define Z_SortResultSetStatus_none Z_SortResponse_none
-#endif
typedef Z_External Z_DatabaseRecord;
typedef struct Z_IOItemOrder Z_ItemOrder;
typedef Z_External Z_DatabaseRecord;
typedef struct Z_IOItemOrder Z_ItemOrder;
@@
-192,6
+194,7
@@
YAZ_END_CDECL
/*
* Local variables:
* c-basic-offset: 4
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab