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
Added log level flag LOG_MALLOC, moved malloc entries there.
[yaz-moved-to-github.git]
/
odr
/
odr.c
diff --git
a/odr/odr.c
b/odr/odr.c
index
787b56e
..
e172eda
100644
(file)
--- a/
odr/odr.c
+++ b/
odr/odr.c
@@
-1,9
+1,15
@@
/*
/*
- * Copyright (c) 1995-2000, Index Data
+ * Copyright (c) 1995-2001, Index Data
* See the file LICENSE for details.
*
* $Log: odr.c,v $
* See the file LICENSE for details.
*
* $Log: odr.c,v $
- * Revision 1.32 2000-01-31 13:15:21 adam
+ * Revision 1.34 2001-02-21 13:46:53 adam
+ * C++ fixes.
+ *
+ * Revision 1.33 2000/02/29 13:44:55 adam
+ * Check for config.h (currently not generated).
+ *
+ * Revision 1.32 2000/01/31 13:15:21 adam
* Removed uses of assert(3). Cleanup of ODR. CCL parser update so
* that some characters are not surrounded by spaces in resulting term.
* ILL-code updates.
* Removed uses of assert(3). Cleanup of ODR. CCL parser update so
* that some characters are not surrounded by spaces in resulting term.
* ILL-code updates.
@@
-110,6
+116,9
@@
*
*
*/
*
*
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdio.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdlib.h>
@@
-117,7
+126,7
@@
#include <yaz/xmalloc.h>
#include <yaz/odr.h>
#include <yaz/xmalloc.h>
#include <yaz/odr.h>
-Odr_null *ODR_NULLVAL = "NULL"; /* the presence of a null value */
+Odr_null *ODR_NULLVAL = (Odr_null *) "NULL"; /* the presence of a null value */
Odr_null *odr_nullval (void)
{
Odr_null *odr_nullval (void)
{