dirfile.h   dirfile.h 
skipping to change at line 28 skipping to change at line 28
// along with GetData; if not, write to the Free Software Foundation, Inc., // along with GetData; if not, write to the Free Software Foundation, Inc.,
// 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA // 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// //
#ifndef GETDATA_DIRFILE_H #ifndef GETDATA_DIRFILE_H
#define GETDATA_DIRFILE_H #define GETDATA_DIRFILE_H
// We don't want the legacy API since its symbols clash with us. // We don't want the legacy API since its symbols clash with us.
#define NO_GETDATA_LEGACY_API #define NO_GETDATA_LEGACY_API
// We use the C89 API since not all C++ compilers support the C99 complex // We use the C89 API since C++ compilers aren't required to support the
// keyword // C99 _Complex keyword
#define GETDATA_C89_API #define GETDATA_C89_API
extern "C" { extern "C" {
#include <getdata.h> #include <getdata.h>
} }
#include <getdata/fragment.h> #include <getdata/fragment.h>
#include <getdata/entry.h> #include <getdata/entry.h>
#include <getdata/rawentry.h> #include <getdata/rawentry.h>
#include <getdata/lincomentry.h> #include <getdata/lincomentry.h>
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 getdata.h   getdata.h 
skipping to change at line 36 skipping to change at line 36
* -------------------------------------------------- * --------------------------------------------------
* *
* Two preprocessor symbols may be defined before including this file to * Two preprocessor symbols may be defined before including this file to
* modify it's use: * modify it's use:
* *
* - defining NO_GETDATA_LEGACY_API will prevent the Legacy API declaration s in * - defining NO_GETDATA_LEGACY_API will prevent the Legacy API declaration s in
* getdata_legacy.h from being declared. If the Legacy API was omitted f rom * getdata_legacy.h from being declared. If the Legacy API was omitted f rom
* the library when it was built, this symbol does nothing. * the library when it was built, this symbol does nothing.
* *
* - defining GETDATA_C89_API will prevent declarations herein from * - defining GETDATA_C89_API will prevent declarations herein from
* using the C99 symbol `complex'. Affected declarations will instead us e a * using the C99 keyword `_Complex'. Affected declarations will instead use a
* two-element array of doubles in place of the complex types. This symb ol * two-element array of doubles in place of the complex types. This symb ol
* permits including these declarations using a non-C99 conforming compil er. * permits including these declarations using a non-C99 conforming compil er.
*/ */
#ifndef GETDATA_H #ifndef GETDATA_H
#define GETDATA_H #define GETDATA_H
/* The most recent standards version supported by this library */ /* The most recent standards version supported by this library */
#define DIRFILE_STANDARDS_VERSION 7 #define DIRFILE_STANDARDS_VERSION 7
skipping to change at line 176 skipping to change at line 176
GD_STRING_ENTRY = GD_SCALAR_ENTRY | 0x01 GD_STRING_ENTRY = GD_SCALAR_ENTRY | 0x01
} gd_entype_t; } gd_entype_t;
/* GD_NO_ENTRY is not part of this count */ /* GD_NO_ENTRY is not part of this count */
#define GD_N_ENTYPES 11 #define GD_N_ENTYPES 11
#define _gd_int16_t short int #define _gd_int16_t short int
#define _gd_uint16_t unsigned short int #define _gd_uint16_t unsigned short int
#define _gd_int64_t long long int #define _gd_int64_t long long int
#ifndef GETDATA_C89_API #ifndef GETDATA_C89_API
# ifndef complex
# include <complex.h>
# endif
# include <inttypes.h> # include <inttypes.h>
# define GD_DCOMPLEXM(v) double complex v # define GD_DCOMPLEXM(v) double _Complex v
# define GD_DCOMPLEXP(v) double complex *v # define GD_DCOMPLEXP(v) double _Complex *v
typedef int16_t gd_bit_t; typedef int16_t gd_bit_t;
typedef uint16_t gd_spf_t; typedef uint16_t gd_spf_t;
typedef int64_t gd_shift_t; typedef int64_t gd_shift_t;
#else #else
# define GD_DCOMPLEXM(v) double v[2] # define GD_DCOMPLEXM(v) double v[2]
# define GD_DCOMPLEXP(v) double *v # define GD_DCOMPLEXP(v) double *v
typedef _gd_int16_t gd_bit_t; typedef _gd_int16_t gd_bit_t;
typedef _gd_uint16_t gd_spf_t; typedef _gd_uint16_t gd_spf_t;
typedef _gd_int64_t gd_shift_t; typedef _gd_int64_t gd_shift_t;
#endif #endif
 End of changes. 3 change blocks. 
6 lines changed or deleted 3 lines changed or added


 getdata.mod   getdata.mod 
GFORTRAN module version '6' created from getdata.f90 on Fri Jul 6 18:31:43 2012 GFORTRAN module version '6' created from getdata.f90 on Fri Jul 6 18:30:53 2012
MD5:124fad8ec61230442764d7f7558b4a66 -- If you edit this, you'll get what y ou deserve. MD5:124fad8ec61230442764d7f7558b4a66 -- If you edit this, you'll get what y ou deserve.
(() () () () () () () () () () () () () () () () () () () () () () () () (() () () () () () () () () () () () () () () () () () () () () () () ()
() () ()) () () ())
() ()
() ()
() ()
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/