Commit 252f7288 authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

make_cdilib: changed position of namespace.h

parent 2236bcb0
......@@ -7,7 +7,9 @@
#include <stdarg.h>
#include <errno.h>
#if !defined (NAMESPACE_H)
#include "namespace.h"
#endif
int _ExitOnError = 1; /* If set to 1, exit on error */
int _Verbose = 1; /* If set to 1, errors are reported */
......@@ -17,7 +19,7 @@ int _Debug = 0; /* If set to 1, debugging */
void SysError_(const char *caller, const char *fmt, ...)
{
va_list args;
va_start(args, fmt);
printf("\n");
......@@ -29,7 +31,7 @@ void SysError_(const char *caller, const char *fmt, ...)
if ( errno )
perror("System error message ");
exit(EXIT_FAILURE);
}
......@@ -37,7 +39,7 @@ void SysError_(const char *caller, const char *fmt, ...)
void Error_(const char *caller, const char *fmt, ...)
{
va_list args;
va_start(args, fmt);
printf("\n");
......@@ -82,7 +84,7 @@ cdiAbortC_serial(const char *caller, const char *filename,
void Warning_(const char *caller, const char *fmt, ...)
{
va_list args;
va_start(args, fmt);
if ( _Verbose )
......@@ -99,7 +101,7 @@ void Warning_(const char *caller, const char *fmt, ...)
void Message_(const char *caller, const char *fmt, ...)
{
va_list args;
va_start(args, fmt);
fprintf(stdout, "%-18s : ", caller);
......
......@@ -149,13 +149,13 @@ c="dmemory.c \
pio_list_set.c"
h="cdi_limits.h taxis.h dtypes.h file.h service.h extra.h \
ieg.h cdi.h timebase.h calendar.h basetime.h datetime.h \
ieg.h cdi.h timebase.h calendar.h basetime.h datetime.h namespace.h \
error.c error.h cdi_int.h cgribex.h gribapi.h \
stream_cgribex.h stream_gribapi.h stream_grb.h stream_cdf.h \
tablepar.h table.h gaussgrid.h grid.h zaxis.h varscan.h binary.h swap.h \
service.h stream_srv.h stream_ext.h stream_ieg.h cdf_int.h \
cdf.h vlist.h vlist_var.h vlist_att.h model.h institution.h \
namespace.h resource_handle.h resource_unpack.h pio_util.h pio.h pio_impl.h serialize.h"
resource_handle.h resource_unpack.h pio_util.h pio.h pio_impl.h serialize.h"
#cat $h >> ${PROG}
#cat $c | grep -v '#include' | grep -v '# include' >> ${PROG}
......
......@@ -10,8 +10,9 @@
#include "mpi.h"
#endif
#ifndef _ERROR_H
#include "error.h"
#endif
#define MAXDEBUG 3
......
......@@ -5,8 +5,6 @@
#ifndef SERIALIZE_H
#define SERIALIZE_H
#include "cdi.h"
/*
* Generic interfaces for (de-)marshalling
*/
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment