Removed #ifdef __cplusplus.

src/CMOR.cc

@@ -9,13 +9,9 @@
 #include "uthash.h"
 #include "util.h"
 
-#ifdef __cplusplus
-  extern "C" {
-#endif
+extern "C" {
 #include "cmor.h"
-#ifdef __cplusplus
-  }
-#endif
+}
 
 #include "netcdf.h"
 #include "pmlist.h"

src/Copy.cc

@@ -28,13 +28,9 @@
 #include "pstream.h"
 
 
-#ifdef __cplusplus
 extern "C" {
-#endif
 int streamGrbInqDataScanningMode(void);
-#if defined (__cplusplus)
 }
-#endif
 
 void *Copy(void *argument)
 {

src/Fillmiss.cc

@@ -29,13 +29,9 @@
 #include "grid.h"
 #include "grid_search.h"
 
-#ifdef __cplusplus
 extern "C" {
-#endif
 #include "clipping/geometry.h"
-#ifdef __cplusplus
 }
-#endif
 
 
 void fillmiss(field_type *field1, field_type *field2, int nfill)

src/Samplegridicon.cc

@@ -3,13 +3,9 @@
 #include "grid.h"
 #include "grid_search.h"
 
-#ifdef __cplusplus
 extern "C" {
-#endif
 #include "clipping/geometry.h"
-#ifdef __cplusplus
 }
-#endif
 
 constexpr int MAX_CHILDS = 9;
 

src/Selmulti.cc

@@ -23,13 +23,9 @@
 
 // NOTE: All operators in this module works only on GRIB edition 1 files!
 
-#ifdef __cplusplus
 extern "C" {
-#endif
 void streamGrbChangeParameterIdentification(int code, int ltype, int lev);
-#if defined (__cplusplus)
 }
-#endif
 
 /*
 Supported notations:

src/Verifygrid.cc

@@ -24,13 +24,9 @@
 #include "cdo_int.h"
 #include "grid.h"
 #include "pstream.h"
-#ifdef __cplusplus
 extern "C" {
-#endif
 #include "clipping/geometry.h"
-#ifdef __cplusplus
 }
-#endif
 #include "time.h"
 
 /* Quicksort is called with a pointer to the array to be sorted and an integer indicating its length. */

src/WindTrans.cc

@@ -36,13 +36,9 @@
 
 #define  MAXARG 10
 
-#ifdef __cplusplus
 extern "C" {
-#endif
 void streamGrbChangeModeUvRelativeToGrid(int mode);
-#if defined (__cplusplus)
 }
-#endif
 
 int UVDESTAG;
 int ROTUVNORTH;

src/YAR.cc

@@ -24,9 +24,7 @@
 #include "remap.h"
 
 #if defined(HAVE_LIBYAC)
-#ifdef __cplusplus
 extern "C" {
-#endif
 #include "points.h"
 #include "grid_reg2d.h"
 #include "grid_search.h"
@@ -34,10 +32,8 @@ extern "C" {
 #include "search.h"
 #include "clipping.h"
 #include "area.h"
-#ifdef __cplusplus
 }
 #endif
-#endif
 
 int timer_yar_remap, timer_yar_remap_init, timer_yar_remap_sort, timer_yar_remap_con, timer_yar_remap_bil;
 

src/after_sptrans.cc

@@ -18,13 +18,9 @@
 #define  HAVE_OPENMP4  1
 #endif
 
-#ifdef __cplusplus
 extern "C" {
-#endif
 void gaussaw(double *pa, double *pw, size_t nlat);
-#if defined (__cplusplus)
 }
-#endif
 
 static
 void jspleg1(double *pleg, double plat, int ktrunc, double *work)

src/after_vertint.h

@@ -3,10 +3,6 @@
 
 #include <stdbool.h>
 
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
 void height2pressure(double *restrict phlev, const double *restrict hlev, long nphlev);
 
 void presh(double *restrict fullp, double *halfp, const double *restrict vct,
@@ -35,8 +31,4 @@ void vert_gen_weights3d(bool expol, int nlev1, int gridsize, double *lev1, int n
 void vert_gen_weights3d1d(bool expol, int nlev1, int gridsize, double *lev1, int nlev2, double *lev2,
 			  int *lev_idx1, int *lev_idx2, double *lev_wgt1, double *lev_wgt2);
 
-#if defined(__cplusplus)
-}
-#endif
-
 #endif  /* VINTERP_H */

src/cdo.cc

@@ -83,13 +83,9 @@ static int CDO_netcdf_hdr_pad = 0;
 static int CDO_Rusage = 0;
 const char *CDO_username;
 
-#ifdef __cplusplus
 extern "C" {
-#endif
 void streamGrbDefDataScanningMode(int scanmode);
-#if defined (__cplusplus)
 }
-#endif
 
 void gridsearch_set_method(const char *methodstr);
 

src/expr.h

@@ -18,11 +18,9 @@
 #include <stdio.h>
 #include <stdbool.h>
 
-#ifdef __cplusplus
 #ifndef fileno
 int fileno(FILE *stream);
 #endif
-#endif
 
 extern int CDO_parser_errorno;
 

src/grid_area.cc

@@ -29,15 +29,11 @@ void lonlat_to_xyz(double lon, double lat, double *xyz)
 }
 
 /*
-#ifdef __cplusplus
 extern "C" {
-#endif
 #include "clipping/grid.h"
 #include "clipping/grid_cell.h"
 #include "clipping/area.h"
-#ifdef __cplusplus
 }
-#endif
 
 static
 double yac_huiliers_area(int num_corners, double *cell_corner_lon, double *cell_corner_lat)

src/grid_proj.h

-#ifndef _GRID_PROJ_H
-#define _GRID_PROJ_H
+#ifndef  GRID_PROJ_H
+#define  GRID_PROJ_H
 
 
 int cdo_lonlat_to_lcc(int gridID, size_t nvals, double *xvals, double *yvals);
@@ -10,15 +10,9 @@ void cdo_laea_to_lonlat(int gridID, size_t nvals, double *xvals, double *yvals);
 
 void cdo_proj_to_lonlat(char *proj4param, size_t nvals, double *xvals, double *yvals);
 
-#ifdef __cplusplus
-extern "C" {
-#endif
 int proj_lonlat_to_lcc(double missval, double lon_0, double lat_0, double lat_1, double lat_2,
                        double a, double rf, size_t nvals, double *xvals, double *yvals);
 int proj_lcc_to_lonlat(double missval, double lon_0, double lat_0, double lat_1, double lat_2,
                        double a, double rf, double x_0, double y_0, size_t nvals, double *xvals, double *yvals);
-#if defined (__cplusplus)
-}
-#endif
 
-#endif  /* _GRID_PROJ_H */
+#endif  /* GRID_PROJ_H */

src/remap_conserv.cc

@@ -4,15 +4,11 @@
 #include "remap.h"
 #include "remap_store_link.h"
 
-#ifdef __cplusplus
 extern "C" {
-#endif
 #include "clipping/clipping.h"
 #include "clipping/area.h"
 #include "clipping/geometry.h"
-#ifdef __cplusplus
 }
-#endif
 
 //#define STIMER