=== modified file 'blas/gsl_blas.h'
--- blas/gsl_blas.h	2013-03-30 20:12:56 +0000
+++ blas/gsl_blas.h	2013-03-30 20:59:11 +0000
@@ -29,17 +29,17 @@
 #include <gsl/gsl_blas_types.h>
 
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 
 /* ========================================================================
@@ -597,6 +597,6 @@
                       gsl_matrix_complex * C);
 
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_BLAS_H */

=== modified file 'blas/gsl_blas_types.h'
--- blas/gsl_blas_types.h	2013-03-30 20:12:56 +0000
+++ blas/gsl_blas_types.h	2013-03-30 20:59:11 +0000
@@ -27,17 +27,17 @@
 
 #include <gsl/gsl_cblas.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 typedef  CBLAS_INDEX  CBLAS_INDEX_t;
 typedef  enum CBLAS_ORDER       CBLAS_ORDER_t;
@@ -48,7 +48,7 @@
 
 /* typedef  gsl_complex  COMPLEX; */
 
-__END_DECLS
+GSL_END_DECLS
 
 
 #endif /* GSL_BLAS_TYPES_H */

=== modified file 'block/gsl_block_char.h'
--- block/gsl_block_char.h	2013-03-30 20:12:56 +0000
+++ block/gsl_block_char.h	2013-03-30 20:59:11 +0000
@@ -23,17 +23,17 @@
 #include <stdlib.h>
 #include <gsl/gsl_errno.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 struct gsl_block_char_struct
 {
@@ -60,6 +60,6 @@
 size_t gsl_block_char_size (const gsl_block_char * b);
 char * gsl_block_char_data (const gsl_block_char * b);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_BLOCK_CHAR_H */

=== modified file 'block/gsl_block_complex_double.h'
--- block/gsl_block_complex_double.h	2013-03-30 20:12:56 +0000
+++ block/gsl_block_complex_double.h	2013-03-30 20:59:11 +0000
@@ -23,17 +23,17 @@
 #include <stdlib.h>
 #include <gsl/gsl_errno.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 struct gsl_block_complex_struct
 {
@@ -60,6 +60,6 @@
 size_t gsl_block_complex_size (const gsl_block_complex * b);
 double * gsl_block_complex_data (const gsl_block_complex * b);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_BLOCK_COMPLEX_DOUBLE_H */

=== modified file 'block/gsl_block_complex_float.h'
--- block/gsl_block_complex_float.h	2013-03-30 20:12:56 +0000
+++ block/gsl_block_complex_float.h	2013-03-30 20:59:11 +0000
@@ -23,17 +23,17 @@
 #include <stdlib.h>
 #include <gsl/gsl_errno.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 struct gsl_block_complex_float_struct
 {
@@ -60,6 +60,6 @@
 size_t gsl_block_complex_float_size (const gsl_block_complex_float * b);
 float * gsl_block_complex_float_data (const gsl_block_complex_float * b);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_BLOCK_COMPLEX_FLOAT_H */

=== modified file 'block/gsl_block_complex_long_double.h'
--- block/gsl_block_complex_long_double.h	2013-03-30 20:12:56 +0000
+++ block/gsl_block_complex_long_double.h	2013-03-30 20:59:11 +0000
@@ -23,17 +23,17 @@
 #include <stdlib.h>
 #include <gsl/gsl_errno.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 struct gsl_block_complex_long_double_struct
 {
@@ -60,6 +60,6 @@
 size_t gsl_block_complex_long_double_size (const gsl_block_complex_long_double * b);
 long double * gsl_block_complex_long_double_data (const gsl_block_complex_long_double * b);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_BLOCK_COMPLEX_LONG_DOUBLE_H */

=== modified file 'block/gsl_block_double.h'
--- block/gsl_block_double.h	2013-03-30 20:12:56 +0000
+++ block/gsl_block_double.h	2013-03-30 20:59:11 +0000
@@ -23,17 +23,17 @@
 #include <stdlib.h>
 #include <gsl/gsl_errno.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 struct gsl_block_struct
 {
@@ -60,6 +60,6 @@
 size_t gsl_block_size (const gsl_block * b);
 double * gsl_block_data (const gsl_block * b);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_BLOCK_DOUBLE_H */

=== modified file 'block/gsl_block_float.h'
--- block/gsl_block_float.h	2013-03-30 20:12:56 +0000
+++ block/gsl_block_float.h	2013-03-30 20:59:11 +0000
@@ -23,17 +23,17 @@
 #include <stdlib.h>
 #include <gsl/gsl_errno.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 struct gsl_block_float_struct
 {
@@ -60,6 +60,6 @@
 size_t gsl_block_float_size (const gsl_block_float * b);
 float * gsl_block_float_data (const gsl_block_float * b);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_BLOCK_FLOAT_H */

=== modified file 'block/gsl_block_int.h'
--- block/gsl_block_int.h	2013-03-30 20:12:56 +0000
+++ block/gsl_block_int.h	2013-03-30 20:59:11 +0000
@@ -23,17 +23,17 @@
 #include <stdlib.h>
 #include <gsl/gsl_errno.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 struct gsl_block_int_struct
 {
@@ -60,6 +60,6 @@
 size_t gsl_block_int_size (const gsl_block_int * b);
 int * gsl_block_int_data (const gsl_block_int * b);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_BLOCK_INT_H */

=== modified file 'block/gsl_block_long.h'
--- block/gsl_block_long.h	2013-03-30 20:12:56 +0000
+++ block/gsl_block_long.h	2013-03-30 20:59:11 +0000
@@ -23,17 +23,17 @@
 #include <stdlib.h>
 #include <gsl/gsl_errno.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 struct gsl_block_long_struct
 {
@@ -60,6 +60,6 @@
 size_t gsl_block_long_size (const gsl_block_long * b);
 long * gsl_block_long_data (const gsl_block_long * b);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_BLOCK_LONG_H */

=== modified file 'block/gsl_block_long_double.h'
--- block/gsl_block_long_double.h	2013-03-30 20:12:56 +0000
+++ block/gsl_block_long_double.h	2013-03-30 20:59:11 +0000
@@ -23,17 +23,17 @@
 #include <stdlib.h>
 #include <gsl/gsl_errno.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 struct gsl_block_long_double_struct
 {
@@ -60,6 +60,6 @@
 size_t gsl_block_long_double_size (const gsl_block_long_double * b);
 long double * gsl_block_long_double_data (const gsl_block_long_double * b);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_BLOCK_LONG_DOUBLE_H */

=== modified file 'block/gsl_block_short.h'
--- block/gsl_block_short.h	2013-03-30 20:12:56 +0000
+++ block/gsl_block_short.h	2013-03-30 20:59:11 +0000
@@ -23,17 +23,17 @@
 #include <stdlib.h>
 #include <gsl/gsl_errno.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 struct gsl_block_short_struct
 {
@@ -60,6 +60,6 @@
 size_t gsl_block_short_size (const gsl_block_short * b);
 short * gsl_block_short_data (const gsl_block_short * b);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_BLOCK_SHORT_H */

=== modified file 'block/gsl_block_uchar.h'
--- block/gsl_block_uchar.h	2013-03-30 20:12:56 +0000
+++ block/gsl_block_uchar.h	2013-03-30 20:59:11 +0000
@@ -23,17 +23,17 @@
 #include <stdlib.h>
 #include <gsl/gsl_errno.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 struct gsl_block_uchar_struct
 {
@@ -60,6 +60,6 @@
 size_t gsl_block_uchar_size (const gsl_block_uchar * b);
 unsigned char * gsl_block_uchar_data (const gsl_block_uchar * b);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_BLOCK_UCHAR_H */

=== modified file 'block/gsl_block_uint.h'
--- block/gsl_block_uint.h	2013-03-30 20:12:56 +0000
+++ block/gsl_block_uint.h	2013-03-30 20:59:11 +0000
@@ -23,17 +23,17 @@
 #include <stdlib.h>
 #include <gsl/gsl_errno.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 struct gsl_block_uint_struct
 {
@@ -60,6 +60,6 @@
 size_t gsl_block_uint_size (const gsl_block_uint * b);
 unsigned int * gsl_block_uint_data (const gsl_block_uint * b);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_BLOCK_UINT_H */

=== modified file 'block/gsl_block_ulong.h'
--- block/gsl_block_ulong.h	2013-03-30 20:12:56 +0000
+++ block/gsl_block_ulong.h	2013-03-30 20:59:11 +0000
@@ -23,17 +23,17 @@
 #include <stdlib.h>
 #include <gsl/gsl_errno.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 struct gsl_block_ulong_struct
 {
@@ -60,6 +60,6 @@
 size_t gsl_block_ulong_size (const gsl_block_ulong * b);
 unsigned long * gsl_block_ulong_data (const gsl_block_ulong * b);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_BLOCK_ULONG_H */

=== modified file 'block/gsl_block_ushort.h'
--- block/gsl_block_ushort.h	2013-03-30 20:12:56 +0000
+++ block/gsl_block_ushort.h	2013-03-30 20:59:11 +0000
@@ -23,17 +23,17 @@
 #include <stdlib.h>
 #include <gsl/gsl_errno.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 struct gsl_block_ushort_struct
 {
@@ -60,6 +60,6 @@
 size_t gsl_block_ushort_size (const gsl_block_ushort * b);
 unsigned short * gsl_block_ushort_data (const gsl_block_ushort * b);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_BLOCK_USHORT_H */

=== modified file 'block/gsl_check_range.h'
--- block/gsl_check_range.h	2013-03-30 20:12:56 +0000
+++ block/gsl_check_range.h	2013-03-30 20:59:11 +0000
@@ -23,17 +23,17 @@
 #include <stdlib.h>
 #include <gsl/gsl_types.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 GSL_VAR int gsl_check_range;
 
@@ -52,6 +52,6 @@
 # endif
 #endif
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_CHECK_RANGE_H */

=== modified file 'bspline/gsl_bspline.h'
--- bspline/gsl_bspline.h	2013-03-30 20:12:56 +0000
+++ bspline/gsl_bspline.h	2013-03-30 20:59:11 +0000
@@ -26,17 +26,17 @@
 #include <gsl/gsl_vector.h>
 #include <gsl/gsl_matrix.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 typedef struct
 {
@@ -114,6 +114,6 @@
                                gsl_bspline_workspace *w,
                                gsl_bspline_deriv_workspace *dw);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_BSPLINE_H */

=== modified file 'cblas/gsl_cblas.h'
--- cblas/gsl_cblas.h	2013-03-30 20:12:56 +0000
+++ cblas/gsl_cblas.h	2013-03-30 20:59:11 +0000
@@ -26,17 +26,17 @@
 #define GSL_CBLAS_H
 #include <stddef.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-#define __BEGIN_DECLS extern "C" {
-#define __END_DECLS }
+#define GSL_BEGIN_DECLS extern "C" {
+#define GSL_END_DECLS }
 #else
-#define __BEGIN_DECLS           /* empty */
-#define __END_DECLS             /* empty */
+#define GSL_BEGIN_DECLS           /* empty */
+#define GSL_END_DECLS             /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 /*
  * Enumerated and derived types
@@ -601,6 +601,6 @@
 
 void cblas_xerbla(int p, const char *rout, const char *form, ...);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_CBLAS_H */

=== modified file 'cdf/gsl_cdf.h'
--- cdf/gsl_cdf.h	2013-03-30 20:12:56 +0000
+++ cdf/gsl_cdf.h	2013-03-30 20:59:11 +0000
@@ -22,17 +22,17 @@
 #ifndef GSL_CDF_H
 #define GSL_CDF_H
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS          /* empty */
-# define __END_DECLS            /* empty */
+# define GSL_BEGIN_DECLS          /* empty */
+# define GSL_END_DECLS            /* empty */
 #endif
 
-__BEGIN_DECLS 
+GSL_BEGIN_DECLS 
 
 double gsl_cdf_ugaussian_P (const double x);
 double gsl_cdf_ugaussian_Q (const double x);
@@ -165,6 +165,6 @@
 double gsl_cdf_hypergeometric_Q (const unsigned int k, const unsigned int n1,
                                  const unsigned int n2, const unsigned int t);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_CDF_H */

=== modified file 'cheb/gsl_chebyshev.h'
--- cheb/gsl_chebyshev.h	2013-03-30 20:12:56 +0000
+++ cheb/gsl_chebyshev.h	2013-03-30 20:59:11 +0000
@@ -23,17 +23,17 @@
 #include <gsl/gsl_math.h>
 #include <gsl/gsl_mode.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 
 /* data for a Chebyshev series over a given interval */
@@ -128,6 +128,6 @@
 
 
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_CHEBYSHEV_H */

=== modified file 'combination/gsl_combination.h'
--- combination/gsl_combination.h	2013-03-30 20:12:56 +0000
+++ combination/gsl_combination.h	2013-03-30 20:59:11 +0000
@@ -27,17 +27,17 @@
 #include <gsl/gsl_inline.h>
 #include <gsl/gsl_check_range.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 struct gsl_combination_struct
 {
@@ -87,6 +87,6 @@
 
 #endif /* HAVE_INLINE */
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_COMBINATION_H */

=== modified file 'complex/gsl_complex.h'
--- complex/gsl_complex.h	2013-03-30 20:12:56 +0000
+++ complex/gsl_complex.h	2013-03-30 20:59:11 +0000
@@ -20,17 +20,17 @@
 #ifndef GSL_COMPLEX_H
 #define GSL_COMPLEX_H
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 
 /* two consecutive built-in types as a complex number */
@@ -98,6 +98,6 @@
 
 #define GSL_SET_COMPLEX_PACKED(zp,n,x,y) do {*((zp)+2*(n))=(x); *((zp)+(2*(n)+1))=(y);} while(0)
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_COMPLEX_H */

=== modified file 'complex/gsl_complex_math.h'
--- complex/gsl_complex_math.h	2013-03-30 20:12:56 +0000
+++ complex/gsl_complex_math.h	2013-03-30 20:59:11 +0000
@@ -22,17 +22,17 @@
 #include <gsl/gsl_inline.h>
 #include <gsl/gsl_complex.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-#define __BEGIN_DECLS extern "C" {
-#define __END_DECLS }
+#define GSL_BEGIN_DECLS extern "C" {
+#define GSL_END_DECLS }
 #else
-#define __BEGIN_DECLS           /* empty */
-#define __END_DECLS             /* empty */
+#define GSL_BEGIN_DECLS           /* empty */
+#define GSL_END_DECLS             /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 /* Complex numbers */
 
@@ -137,6 +137,6 @@
 gsl_complex gsl_complex_arctanh_real (double a);  /* r=arctanh(a) */
 gsl_complex gsl_complex_arccoth (gsl_complex a);  /* r=arccoth(a) */
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_COMPLEX_MATH_H */

=== modified file 'contrib/wigner.h'
--- contrib/wigner.h	2013-03-30 20:12:56 +0000
+++ contrib/wigner.h	2013-03-30 20:59:11 +0000
@@ -20,17 +20,17 @@
 #define  GSL_SF_WIGNER_H 1
 #include <gsl/gsl_sf_result.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS          /* empty */
-# define __END_DECLS            /* empty */
+# define GSL_BEGIN_DECLS          /* empty */
+# define GSL_END_DECLS            /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
   double gsl_sf_wigner_3j (const int two_j1, const int two_j2,
                            const int two_j3, const int two_m1,
                            const int two_m2, const int two_m3);
@@ -59,5 +59,5 @@
 int gsl_sf_wigner_drot_e (const int two_j, const int two_m1, const int two_m2,
                           const double theta, gsl_sf_result * result);
 
-__END_DECLS
+GSL_END_DECLS
 #endif /* GSL_SF_WIGNER_H */

=== modified file 'deriv/gsl_deriv.h'
--- deriv/gsl_deriv.h	2013-03-30 20:12:56 +0000
+++ deriv/gsl_deriv.h	2013-03-30 20:59:11 +0000
@@ -21,17 +21,17 @@
 #define GSL_DERIV_H
 #include <gsl/gsl_math.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 int gsl_deriv_central (const gsl_function *f,
                        double x, double h,
@@ -45,6 +45,6 @@
                        double x, double h,
                        double *result, double *abserr);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_DERIV_H */

=== modified file 'dht/gsl_dht.h'
--- dht/gsl_dht.h	2013-03-30 20:12:56 +0000
+++ dht/gsl_dht.h	2013-03-30 20:59:11 +0000
@@ -22,17 +22,17 @@
 #ifndef GSL_DHT_H
 #define GSL_DHT_H
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 
 struct gsl_dht_struct {
@@ -82,6 +82,6 @@
 int gsl_dht_apply(const gsl_dht * t, double * f_in, double * f_out);
 
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_DHT_H */

=== modified file 'diff/gsl_diff.h'
--- diff/gsl_diff.h	2013-03-30 20:12:56 +0000
+++ diff/gsl_diff.h	2013-03-30 20:59:11 +0000
@@ -21,17 +21,17 @@
 #define GSL_DIFF_H
 #include <gsl/gsl_math.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 #ifndef GSL_DISABLE_DEPRECATED
 int gsl_diff_central (const gsl_function *f,
@@ -47,6 +47,6 @@
                       double *result, double *abserr);
 #endif
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_DIFF_H */

=== modified file 'eigen/gsl_eigen.h'
--- eigen/gsl_eigen.h	2013-03-30 20:12:56 +0000
+++ eigen/gsl_eigen.h	2013-03-30 20:59:11 +0000
@@ -23,17 +23,17 @@
 #include <gsl/gsl_vector.h>
 #include <gsl/gsl_matrix.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 typedef struct {
   size_t size;
@@ -342,6 +342,6 @@
 
 
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_EIGEN_H */

=== modified file 'err/gsl_errno.h'
--- err/gsl_errno.h	2013-03-30 20:12:56 +0000
+++ err/gsl_errno.h	2013-03-30 20:59:11 +0000
@@ -24,17 +24,17 @@
 #include <errno.h>
 #include <gsl/gsl_types.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 enum { 
   GSL_SUCCESS  = 0, 
@@ -149,6 +149,6 @@
 
 #define GSL_STATUS_UPDATE(sp, s) do { if ((s) != GSL_SUCCESS) *(sp) = (s);} while(0)
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_ERRNO_H */

=== modified file 'err/gsl_message.h'
--- err/gsl_message.h	2013-03-30 20:12:56 +0000
+++ err/gsl_message.h	2013-03-30 20:59:11 +0000
@@ -21,17 +21,17 @@
 #define GSL_MESSAGE_H
 #include <gsl/gsl_types.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 /* Provide a general messaging service for client use.  Messages can
  * be selectively turned off at compile time by defining an
@@ -73,7 +73,7 @@
        } while (0)
 #endif
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_MESSAGE_H */
 

=== modified file 'fft/gsl_dft_complex.h'
--- fft/gsl_dft_complex.h	2013-03-30 20:12:56 +0000
+++ fft/gsl_dft_complex.h	2013-03-30 20:59:11 +0000
@@ -26,17 +26,17 @@
 #include <gsl/gsl_complex.h>
 #include <gsl/gsl_fft.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 int gsl_dft_complex_forward (const double data[], const size_t stride, const size_t n,
                              double result[]);
@@ -50,6 +50,6 @@
 int gsl_dft_complex_transform (const double data[], const size_t stride, const size_t n,
                      double result[], const gsl_fft_direction sign);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_DFT_COMPLEX_H */

=== modified file 'fft/gsl_dft_complex_float.h'
--- fft/gsl_dft_complex_float.h	2013-03-30 20:12:56 +0000
+++ fft/gsl_dft_complex_float.h	2013-03-30 20:59:11 +0000
@@ -26,17 +26,17 @@
 #include <gsl/gsl_complex.h>
 #include <gsl/gsl_fft.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 int gsl_dft_complex_float_forward (const float data[], const size_t stride, const size_t n,
                              float result[]);
@@ -50,6 +50,6 @@
 int gsl_dft_complex_float_transform (const float data[], const size_t stride, const size_t n,
                      float result[], const gsl_fft_direction sign);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_DFT_COMPLEX_FLOAT_H */

=== modified file 'fft/gsl_fft.h'
--- fft/gsl_fft.h	2013-03-30 20:12:56 +0000
+++ fft/gsl_fft.h	2013-03-30 20:59:11 +0000
@@ -22,17 +22,17 @@
 
 #include <gsl/gsl_complex.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 #ifndef GSL_DISABLE_DEPRECATED
 typedef enum
@@ -55,6 +55,6 @@
        
    where - is the forward transform direction and + the inverse direction */
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_FFT_H */

=== modified file 'fft/gsl_fft_complex.h'
--- fft/gsl_fft_complex.h	2013-03-30 20:12:56 +0000
+++ fft/gsl_fft_complex.h	2013-03-30 20:59:11 +0000
@@ -26,17 +26,17 @@
 #include <gsl/gsl_complex.h>
 #include <gsl/gsl_fft.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 /*  Power of 2 routines  */
 
@@ -131,6 +131,6 @@
                                gsl_fft_complex_workspace * work,
                                const gsl_fft_direction sign);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_FFT_COMPLEX_H */

=== modified file 'fft/gsl_fft_complex_float.h'
--- fft/gsl_fft_complex_float.h	2013-03-30 20:12:56 +0000
+++ fft/gsl_fft_complex_float.h	2013-03-30 20:59:11 +0000
@@ -26,17 +26,17 @@
 #include <gsl/gsl_complex.h>
 #include <gsl/gsl_fft.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 /*  Power of 2 routines  */
 
@@ -132,7 +132,7 @@
                                      gsl_fft_complex_workspace_float * work,
                                      const gsl_fft_direction sign);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_FFT_COMPLEX_FLOAT_H */
 

=== modified file 'fft/gsl_fft_halfcomplex.h'
--- fft/gsl_fft_halfcomplex.h	2013-03-30 20:12:56 +0000
+++ fft/gsl_fft_halfcomplex.h	2013-03-30 20:59:11 +0000
@@ -27,17 +27,17 @@
 #include <gsl/gsl_fft.h>
 #include <gsl/gsl_fft_real.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 int gsl_fft_halfcomplex_radix2_backward (double data[], const size_t stride, const size_t n);
 int gsl_fft_halfcomplex_radix2_inverse (double data[], const size_t stride, const size_t n);
@@ -81,6 +81,6 @@
                                    double complex_coefficient[],
                                    const size_t stride, const size_t n);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_FFT_HALFCOMPLEX_H */

=== modified file 'fft/gsl_fft_halfcomplex_float.h'
--- fft/gsl_fft_halfcomplex_float.h	2013-03-30 20:12:56 +0000
+++ fft/gsl_fft_halfcomplex_float.h	2013-03-30 20:59:11 +0000
@@ -27,17 +27,17 @@
 #include <gsl/gsl_fft.h>
 #include <gsl/gsl_fft_real_float.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 int gsl_fft_halfcomplex_float_radix2_backward (float data[], const size_t stride, const size_t n);
 int gsl_fft_halfcomplex_float_radix2_inverse (float data[], const size_t stride, const size_t n);
@@ -81,6 +81,6 @@
                                          float complex_coefficient[],
                                          const size_t stride, const size_t n);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_FFT_HALFCOMPLEX_FLOAT_H */

=== modified file 'fft/gsl_fft_real.h'
--- fft/gsl_fft_real.h	2013-03-30 20:12:56 +0000
+++ fft/gsl_fft_real.h	2013-03-30 20:59:11 +0000
@@ -26,17 +26,17 @@
 #include <gsl/gsl_complex.h>
 #include <gsl/gsl_fft.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 int gsl_fft_real_radix2_transform (double data[], const size_t stride, const size_t n) ;
 
@@ -75,6 +75,6 @@
                          double complex_coefficient[],
                          const size_t stride, const size_t n);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_FFT_REAL_H */

=== modified file 'fft/gsl_fft_real_float.h'
--- fft/gsl_fft_real_float.h	2013-03-30 20:12:56 +0000
+++ fft/gsl_fft_real_float.h	2013-03-30 20:59:11 +0000
@@ -26,17 +26,17 @@
 #include <gsl/gsl_complex.h>
 #include <gsl/gsl_fft.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 int gsl_fft_real_float_radix2_transform (float data[], const size_t stride, const size_t n) ;
 
@@ -74,6 +74,6 @@
                                float complex_coefficient[],
                                const size_t stride, const size_t n);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_FFT_REAL_FLOAT_H */

=== modified file 'fit/gsl_fit.h'
--- fit/gsl_fit.h	2013-03-30 20:12:56 +0000
+++ fit/gsl_fit.h	2013-03-30 20:59:11 +0000
@@ -23,17 +23,17 @@
 #include <stdlib.h>
 #include <gsl/gsl_math.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 int gsl_fit_linear (const double * x, const size_t xstride,
                     const double * y, const size_t ystride,
@@ -80,6 +80,6 @@
                  const double cov11,
                  double *y, double *y_err);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_FIT_H */

=== modified file 'gsl_math.h'
--- gsl_math.h	2013-03-30 20:12:56 +0000
+++ gsl_math.h	2013-03-30 20:59:11 +0000
@@ -97,17 +97,17 @@
 #define M_EULER    0.57721566490153286060651209008      /* Euler constant */
 #endif
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 /* other needlessly compulsive abstractions */
 
@@ -159,6 +159,6 @@
 
 #define GSL_FN_VEC_EVAL(F,x,y) (*((F)->function))(x,y,(F)->params)
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_MATH_H */

=== modified file 'gsl_minmax.h'
--- gsl_minmax.h	2013-03-30 20:12:56 +0000
+++ gsl_minmax.h	2013-03-30 20:59:11 +0000
@@ -21,17 +21,17 @@
 #define GSL_MINMAX_H
 #include <gsl/gsl_inline.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 /* Define MAX and MIN macros/functions if they don't exist. */
 
@@ -97,6 +97,6 @@
 #define GSL_MIN_LDBL(a,b)  GSL_MIN(a,b)
 #endif /* HAVE_INLINE */
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_POW_INT_H */

=== modified file 'gsl_mode.h'
--- gsl_mode.h	2013-03-30 20:12:56 +0000
+++ gsl_mode.h	2013-03-30 20:59:11 +0000
@@ -23,17 +23,17 @@
 #define GSL_MODE_H
 #include <gsl/gsl_inline.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 
 /* Some functions can take a mode argument. This
@@ -83,6 +83,6 @@
 #define GSL_MODE_DEFAULT  0
 
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_MODE_H */

=== modified file 'gsl_pow_int.h'
--- gsl_pow_int.h	2013-03-30 20:12:56 +0000
+++ gsl_pow_int.h	2013-03-30 20:59:11 +0000
@@ -21,17 +21,17 @@
 #define GSL_POW_INT_H
 #include <gsl/gsl_inline.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 INLINE_DECL double gsl_pow_2(const double x);
 INLINE_DECL double gsl_pow_3(const double x);
@@ -56,6 +56,6 @@
 double gsl_pow_int(double x, int n);
 double gsl_pow_uint(double x, unsigned int n);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_POW_INT_H */

=== modified file 'gsl_precision.h'
--- gsl_precision.h	2013-03-30 20:12:56 +0000
+++ gsl_precision.h	2013-03-30 20:59:11 +0000
@@ -23,17 +23,17 @@
 #define GSL_PRECISION_H
 #include <gsl/gsl_types.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 
 /* A type for the precision indicator.
@@ -61,6 +61,6 @@
 GSL_VAR const double gsl_prec_root6_eps[];
 
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_PRECISION_H */

=== modified file 'histogram/gsl_histogram.h'
--- histogram/gsl_histogram.h	2013-03-30 20:12:56 +0000
+++ histogram/gsl_histogram.h	2013-03-30 20:59:11 +0000
@@ -23,17 +23,17 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 typedef struct {
   size_t n ;
@@ -129,6 +129,6 @@
 void gsl_histogram_pdf_free (gsl_histogram_pdf * p);
 double gsl_histogram_pdf_sample (const gsl_histogram_pdf * p, double r);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_HISTOGRAM_H */

=== modified file 'histogram/gsl_histogram2d.h'
--- histogram/gsl_histogram2d.h	2013-03-30 20:12:56 +0000
+++ histogram/gsl_histogram2d.h	2013-03-30 20:59:11 +0000
@@ -23,17 +23,17 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 typedef struct {
   size_t nx, ny ;
@@ -166,7 +166,7 @@
                                    double r1, double r2, 
                                    double * x, double * y);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_HISTOGRAM2D_H */
 

=== modified file 'ieee-utils/gsl_ieee_utils.h'
--- ieee-utils/gsl_ieee_utils.h	2013-03-30 20:12:56 +0000
+++ ieee-utils/gsl_ieee_utils.h	2013-03-30 20:59:11 +0000
@@ -21,17 +21,17 @@
 #define GSL_IEEE_UTILS_H
 #include <stdio.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 enum {
   GSL_IEEE_TYPE_NAN = 1,
@@ -93,7 +93,7 @@
                                int * rounding, int * exception_mask) ;
 int gsl_ieee_set_mode (int precision, int rounding, int exception_mask) ;
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_IEEE_UTILS_H */
 

=== modified file 'integration/gsl_integration.h'
--- integration/gsl_integration.h	2013-03-30 20:12:56 +0000
+++ integration/gsl_integration.h	2013-03-30 20:59:11 +0000
@@ -22,17 +22,17 @@
 #include <stdlib.h>
 #include <gsl/gsl_math.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 /* Workspace for adaptive integrators */
 
@@ -318,6 +318,6 @@
 		       double *result, double *abserr, size_t * nevals);
 
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_INTEGRATION_H */

=== modified file 'interpolation/gsl_interp.h'
--- interpolation/gsl_interp.h	2013-03-30 20:12:56 +0000
+++ interpolation/gsl_interp.h	2013-03-30 20:59:11 +0000
@@ -25,17 +25,17 @@
 #include <gsl/gsl_inline.h>
 #include <gsl/gsl_types.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 /* evaluation accelerator */
 typedef struct {
@@ -219,6 +219,6 @@
 #endif /* HAVE_INLINE */
 
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_INTERP_H */

=== modified file 'interpolation/gsl_spline.h'
--- interpolation/gsl_spline.h	2013-03-30 20:12:56 +0000
+++ interpolation/gsl_spline.h	2013-03-30 20:59:11 +0000
@@ -22,17 +22,17 @@
 #include <stdlib.h>
 #include <gsl/gsl_interp.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 
 /* general interpolation object */
@@ -96,6 +96,6 @@
 void
 gsl_spline_free(gsl_spline * spline);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_INTERP_H */

=== modified file 'linalg/gsl_linalg.h'
--- linalg/gsl_linalg.h	2013-03-30 20:12:56 +0000
+++ linalg/gsl_linalg.h	2013-03-30 20:59:11 +0000
@@ -25,17 +25,17 @@
 #include <gsl/gsl_vector.h>
 #include <gsl/gsl_matrix.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-#define __BEGIN_DECLS extern "C" {
-#define __END_DECLS }
+#define GSL_BEGIN_DECLS extern "C" {
+#define GSL_END_DECLS }
 #else
-#define __BEGIN_DECLS           /* empty */
-#define __END_DECLS             /* empty */
+#define GSL_BEGIN_DECLS           /* empty */
+#define GSL_END_DECLS             /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 typedef enum
   {
@@ -587,6 +587,6 @@
 int gsl_linalg_balance_columns (gsl_matrix * A, gsl_vector * D);
 
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_LINALG_H */

=== modified file 'matrix/gsl_matrix_char.h'
--- matrix/gsl_matrix_char.h	2013-03-30 20:12:56 +0000
+++ matrix/gsl_matrix_char.h	2013-03-30 20:59:11 +0000
@@ -27,17 +27,17 @@
 #include <gsl/gsl_check_range.h>
 #include <gsl/gsl_vector_char.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 typedef struct 
 {
@@ -345,6 +345,6 @@
 
 #endif
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_MATRIX_CHAR_H */

=== modified file 'matrix/gsl_matrix_complex_double.h'
--- matrix/gsl_matrix_complex_double.h	2013-03-30 20:12:56 +0000
+++ matrix/gsl_matrix_complex_double.h	2013-03-30 20:59:11 +0000
@@ -27,17 +27,17 @@
 #include <gsl/gsl_check_range.h>
 #include <gsl/gsl_vector_complex_double.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 typedef struct 
 {
@@ -346,6 +346,6 @@
 
 #endif /* HAVE_INLINE */
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_MATRIX_COMPLEX_DOUBLE_H */

=== modified file 'matrix/gsl_matrix_complex_float.h'
--- matrix/gsl_matrix_complex_float.h	2013-03-30 20:12:56 +0000
+++ matrix/gsl_matrix_complex_float.h	2013-03-30 20:59:11 +0000
@@ -27,17 +27,17 @@
 #include <gsl/gsl_check_range.h>
 #include <gsl/gsl_vector_complex_float.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 typedef struct 
 {
@@ -346,6 +346,6 @@
 
 #endif /* HAVE_INLINE */
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_MATRIX_COMPLEX_FLOAT_H */

=== modified file 'matrix/gsl_matrix_complex_long_double.h'
--- matrix/gsl_matrix_complex_long_double.h	2013-03-30 20:12:56 +0000
+++ matrix/gsl_matrix_complex_long_double.h	2013-03-30 20:59:11 +0000
@@ -27,17 +27,17 @@
 #include <gsl/gsl_check_range.h>
 #include <gsl/gsl_vector_complex_long_double.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 typedef struct 
 {
@@ -346,6 +346,6 @@
 
 #endif /* HAVE_INLINE */
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_MATRIX_COMPLEX_LONG_DOUBLE_H */

=== modified file 'matrix/gsl_matrix_double.h'
--- matrix/gsl_matrix_double.h	2013-03-30 20:12:56 +0000
+++ matrix/gsl_matrix_double.h	2013-03-30 20:59:11 +0000
@@ -27,17 +27,17 @@
 #include <gsl/gsl_check_range.h>
 #include <gsl/gsl_vector_double.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 typedef struct 
 {
@@ -345,6 +345,6 @@
 
 #endif
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_MATRIX_DOUBLE_H */

=== modified file 'matrix/gsl_matrix_float.h'
--- matrix/gsl_matrix_float.h	2013-03-30 20:12:56 +0000
+++ matrix/gsl_matrix_float.h	2013-03-30 20:59:11 +0000
@@ -27,17 +27,17 @@
 #include <gsl/gsl_check_range.h>
 #include <gsl/gsl_vector_float.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 typedef struct 
 {
@@ -345,6 +345,6 @@
 
 #endif
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_MATRIX_FLOAT_H */

=== modified file 'matrix/gsl_matrix_int.h'
--- matrix/gsl_matrix_int.h	2013-03-30 20:12:56 +0000
+++ matrix/gsl_matrix_int.h	2013-03-30 20:59:11 +0000
@@ -27,17 +27,17 @@
 #include <gsl/gsl_check_range.h>
 #include <gsl/gsl_vector_int.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 typedef struct 
 {
@@ -345,6 +345,6 @@
 
 #endif
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_MATRIX_INT_H */

=== modified file 'matrix/gsl_matrix_long.h'
--- matrix/gsl_matrix_long.h	2013-03-30 20:12:56 +0000
+++ matrix/gsl_matrix_long.h	2013-03-30 20:59:11 +0000
@@ -27,17 +27,17 @@
 #include <gsl/gsl_check_range.h>
 #include <gsl/gsl_vector_long.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 typedef struct 
 {
@@ -345,6 +345,6 @@
 
 #endif
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_MATRIX_LONG_H */

=== modified file 'matrix/gsl_matrix_long_double.h'
--- matrix/gsl_matrix_long_double.h	2013-03-30 20:12:56 +0000
+++ matrix/gsl_matrix_long_double.h	2013-03-30 20:59:11 +0000
@@ -27,17 +27,17 @@
 #include <gsl/gsl_check_range.h>
 #include <gsl/gsl_vector_long_double.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 typedef struct 
 {
@@ -345,6 +345,6 @@
 
 #endif
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_MATRIX_LONG_DOUBLE_H */

=== modified file 'matrix/gsl_matrix_short.h'
--- matrix/gsl_matrix_short.h	2013-03-30 20:12:56 +0000
+++ matrix/gsl_matrix_short.h	2013-03-30 20:59:11 +0000
@@ -27,17 +27,17 @@
 #include <gsl/gsl_check_range.h>
 #include <gsl/gsl_vector_short.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 typedef struct 
 {
@@ -345,6 +345,6 @@
 
 #endif
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_MATRIX_SHORT_H */

=== modified file 'matrix/gsl_matrix_uchar.h'
--- matrix/gsl_matrix_uchar.h	2013-03-30 20:12:56 +0000
+++ matrix/gsl_matrix_uchar.h	2013-03-30 20:59:11 +0000
@@ -27,17 +27,17 @@
 #include <gsl/gsl_check_range.h>
 #include <gsl/gsl_vector_uchar.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 typedef struct 
 {
@@ -345,6 +345,6 @@
 
 #endif
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_MATRIX_UCHAR_H */

=== modified file 'matrix/gsl_matrix_uint.h'
--- matrix/gsl_matrix_uint.h	2013-03-30 20:12:56 +0000
+++ matrix/gsl_matrix_uint.h	2013-03-30 20:59:11 +0000
@@ -27,17 +27,17 @@
 #include <gsl/gsl_check_range.h>
 #include <gsl/gsl_vector_uint.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 typedef struct 
 {
@@ -345,6 +345,6 @@
 
 #endif
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_MATRIX_UINT_H */

=== modified file 'matrix/gsl_matrix_ulong.h'
--- matrix/gsl_matrix_ulong.h	2013-03-30 20:12:56 +0000
+++ matrix/gsl_matrix_ulong.h	2013-03-30 20:59:11 +0000
@@ -27,17 +27,17 @@
 #include <gsl/gsl_check_range.h>
 #include <gsl/gsl_vector_ulong.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 typedef struct 
 {
@@ -345,6 +345,6 @@
 
 #endif
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_MATRIX_ULONG_H */

=== modified file 'matrix/gsl_matrix_ushort.h'
--- matrix/gsl_matrix_ushort.h	2013-03-30 20:12:56 +0000
+++ matrix/gsl_matrix_ushort.h	2013-03-30 20:59:11 +0000
@@ -27,17 +27,17 @@
 #include <gsl/gsl_check_range.h>
 #include <gsl/gsl_vector_ushort.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 typedef struct 
 {
@@ -345,6 +345,6 @@
 
 #endif
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_MATRIX_USHORT_H */

=== modified file 'min/gsl_min.h'
--- min/gsl_min.h	2013-03-30 20:12:56 +0000
+++ min/gsl_min.h	2013-03-30 20:59:11 +0000
@@ -24,17 +24,17 @@
 #include <gsl/gsl_types.h>
 #include <gsl/gsl_math.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 typedef struct
   {
@@ -106,6 +106,6 @@
                      double *x_upper, double * f_upper,
                      size_t eval_max);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_MIN_H */

=== modified file 'monte/gsl_monte.h'
--- monte/gsl_monte.h	2013-03-30 20:12:56 +0000
+++ monte/gsl_monte.h	2013-03-30 20:59:11 +0000
@@ -23,17 +23,17 @@
 #ifndef GSL_MONTE_H
 #define GSL_MONTE_H
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 /* Hide the function type in a typedef so that we can use it in all our
    integration functions, and make it easy to change things.
@@ -50,6 +50,6 @@
 #define GSL_MONTE_FN_EVAL(F,x) (*((F)->f))(x,(F)->dim,(F)->params)
 
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_MONTE_H */

=== modified file 'monte/gsl_monte_miser.h'
--- monte/gsl_monte_miser.h	2013-03-30 20:12:56 +0000
+++ monte/gsl_monte_miser.h	2013-03-30 20:59:11 +0000
@@ -27,17 +27,17 @@
 #include <gsl/gsl_monte.h>
 #include <gsl/gsl_monte_plain.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 typedef struct {
   size_t min_calls;
@@ -92,6 +92,6 @@
 void gsl_monte_miser_params_set (gsl_monte_miser_state * state,
 				 const gsl_monte_miser_params * params);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_MONTE_MISER_H */

=== modified file 'monte/gsl_monte_plain.h'
--- monte/gsl_monte_plain.h	2013-03-30 20:12:56 +0000
+++ monte/gsl_monte_plain.h	2013-03-30 20:59:11 +0000
@@ -28,17 +28,17 @@
 #include <gsl/gsl_monte.h>
 #include <gsl/gsl_rng.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 typedef struct {
   size_t dim;
@@ -60,6 +60,6 @@
 
 void gsl_monte_plain_free (gsl_monte_plain_state* state);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_MONTE_PLAIN_H */

=== modified file 'monte/gsl_monte_vegas.h'
--- monte/gsl_monte_vegas.h	2013-03-30 20:12:56 +0000
+++ monte/gsl_monte_vegas.h	2013-03-30 20:59:11 +0000
@@ -27,17 +27,17 @@
 #include <gsl/gsl_rng.h>
 #include <gsl/gsl_monte.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 enum {GSL_VEGAS_MODE_IMPORTANCE = 1, 
       GSL_VEGAS_MODE_IMPORTANCE_ONLY = 0, 
@@ -119,7 +119,7 @@
 void gsl_monte_vegas_params_set (gsl_monte_vegas_state * state,
 				 const gsl_monte_vegas_params * params);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_MONTE_VEGAS_H */
 

=== modified file 'multifit/gsl_multifit.h'
--- multifit/gsl_multifit.h	2013-03-30 20:12:56 +0000
+++ multifit/gsl_multifit.h	2013-03-30 20:59:11 +0000
@@ -25,17 +25,17 @@
 #include <gsl/gsl_vector.h>
 #include <gsl/gsl_matrix.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 typedef struct 
 {
@@ -125,6 +125,6 @@
 gsl_multifit_linear_residuals (const gsl_matrix *X, const gsl_vector *y,
                                const gsl_vector *c, gsl_vector *r);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_MULTIFIT_H */

=== modified file 'multifit/gsl_multifit_nlin.h'
--- multifit/gsl_multifit_nlin.h	2013-03-30 20:12:56 +0000
+++ multifit/gsl_multifit_nlin.h	2013-03-30 20:59:11 +0000
@@ -26,17 +26,17 @@
 #include <gsl/gsl_vector.h>
 #include <gsl/gsl_matrix.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 int gsl_multifit_gradient (const gsl_matrix * J, const gsl_vector * f,
                            gsl_vector * g);
@@ -167,6 +167,6 @@
 GSL_VAR const gsl_multifit_fdfsolver_type * gsl_multifit_fdfsolver_lmsder;
 
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_MULTIFIT_NLIN_H */

=== modified file 'multimin/gsl_multimin.h'
--- multimin/gsl_multimin.h	2013-03-30 20:12:56 +0000
+++ multimin/gsl_multimin.h	2013-03-30 20:59:11 +0000
@@ -30,17 +30,17 @@
 #include <gsl/gsl_matrix.h>
 #include <gsl/gsl_min.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 /* Definition of an arbitrary real-valued function with gsl_vector input and */
 /* parameters */
@@ -221,6 +221,6 @@
 GSL_VAR const gsl_multimin_fminimizer_type *gsl_multimin_fminimizer_nmsimplex2;
 GSL_VAR const gsl_multimin_fminimizer_type *gsl_multimin_fminimizer_nmsimplex2rand;
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_MULTIMIN_H */

=== modified file 'multiroots/gsl_multiroots.h'
--- multiroots/gsl_multiroots.h	2013-03-30 20:12:56 +0000
+++ multiroots/gsl_multiroots.h	2013-03-30 20:59:11 +0000
@@ -26,17 +26,17 @@
 #include <gsl/gsl_vector.h>
 #include <gsl/gsl_matrix.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 /* Definition of vector-valued functions with parameters based on gsl_vector */
 
@@ -172,6 +172,6 @@
 GSL_VAR const gsl_multiroot_fdfsolver_type * gsl_multiroot_fdfsolver_hybridsj;
 
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_MULTIROOTS_H */

=== modified file 'multiset/gsl_multiset.h'
--- multiset/gsl_multiset.h	2013-03-30 20:12:56 +0000
+++ multiset/gsl_multiset.h	2013-03-30 20:59:11 +0000
@@ -28,17 +28,17 @@
 #include <gsl/gsl_inline.h>
 #include <gsl/gsl_check_range.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 struct gsl_multiset_struct
 {
@@ -88,6 +88,6 @@
 
 #endif /* HAVE_INLINE */
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_MULTISET_H */

=== modified file 'ntuple/gsl_ntuple.h'
--- ntuple/gsl_ntuple.h	2013-03-30 20:12:56 +0000
+++ ntuple/gsl_ntuple.h	2013-03-30 20:59:11 +0000
@@ -28,17 +28,17 @@
 #include <gsl/gsl_errno.h>
 #include <gsl/gsl_histogram.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 typedef struct {
     FILE * file;
@@ -73,7 +73,7 @@
 
 int gsl_ntuple_close (gsl_ntuple * ntuple);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_NTUPLE_H */
 

=== modified file 'ode-initval/gsl_odeiv.h'
--- ode-initval/gsl_odeiv.h	2013-03-30 20:12:56 +0000
+++ ode-initval/gsl_odeiv.h	2013-03-30 20:59:11 +0000
@@ -26,17 +26,17 @@
 #include <stdlib.h>
 #include <gsl/gsl_types.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 
 /* Description of a system of ODEs.
@@ -225,6 +225,6 @@
 void gsl_odeiv_evolve_free(gsl_odeiv_evolve * e);
 
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_ODEIV_H */

=== modified file 'ode-initval2/gsl_odeiv2.h'
--- ode-initval2/gsl_odeiv2.h	2013-03-30 20:12:56 +0000
+++ ode-initval2/gsl_odeiv2.h	2013-03-30 20:59:11 +0000
@@ -27,17 +27,17 @@
 #include <stdlib.h>
 #include <gsl/gsl_types.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS          /* empty */
-# define __END_DECLS            /* empty */
+# define GSL_BEGIN_DECLS          /* empty */
+# define GSL_END_DECLS            /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 /* Description of a system of ODEs.
  *
  * y' = f(t,y) = dydt(t, y)
@@ -329,5 +329,5 @@
 int gsl_odeiv2_driver_reset_hstart (gsl_odeiv2_driver * d, const double hstart);
 void gsl_odeiv2_driver_free (gsl_odeiv2_driver * state);
 
-__END_DECLS
+GSL_END_DECLS
 #endif /* GSL_ODEIV2_H */

=== modified file 'permutation/gsl_permutation.h'
--- permutation/gsl_permutation.h	2013-03-30 20:12:56 +0000
+++ permutation/gsl_permutation.h	2013-03-30 20:59:11 +0000
@@ -26,17 +26,17 @@
 #include <gsl/gsl_inline.h>
 #include <gsl/gsl_check_range.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 struct gsl_permutation_struct
 {
@@ -95,6 +95,6 @@
 
 #endif /* HAVE_INLINE */
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_PERMUTATION_H */

=== modified file 'permutation/gsl_permute_char.h'
--- permutation/gsl_permute_char.h	2013-03-30 20:12:56 +0000
+++ permutation/gsl_permute_char.h	2013-03-30 20:59:11 +0000
@@ -24,21 +24,21 @@
 #include <gsl/gsl_errno.h>
 #include <gsl/gsl_permutation.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 int gsl_permute_char (const size_t * p, char * data, const size_t stride, const size_t n);
 int gsl_permute_char_inverse (const size_t * p, char * data, const size_t stride, const size_t n);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_PERMUTE_CHAR_H */

=== modified file 'permutation/gsl_permute_complex_double.h'
--- permutation/gsl_permute_complex_double.h	2013-03-30 20:12:56 +0000
+++ permutation/gsl_permute_complex_double.h	2013-03-30 20:59:11 +0000
@@ -25,21 +25,21 @@
 #include <gsl/gsl_complex.h>
 #include <gsl/gsl_permutation.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 int gsl_permute_complex (const size_t * p, double * data, const size_t stride, const size_t n);
 int gsl_permute_complex_inverse (const size_t * p, double * data, const size_t stride, const size_t n);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_PERMUTE_COMPLEX_DOUBLE_H */

=== modified file 'permutation/gsl_permute_complex_float.h'
--- permutation/gsl_permute_complex_float.h	2013-03-30 20:12:56 +0000
+++ permutation/gsl_permute_complex_float.h	2013-03-30 20:59:11 +0000
@@ -25,21 +25,21 @@
 #include <gsl/gsl_complex.h>
 #include <gsl/gsl_permutation.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 int gsl_permute_complex_float (const size_t * p, float * data, const size_t stride, const size_t n);
 int gsl_permute_complex_float_inverse (const size_t * p, float * data, const size_t stride, const size_t n);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_PERMUTE_COMPLEX_FLOAT_H */

=== modified file 'permutation/gsl_permute_complex_long_double.h'
--- permutation/gsl_permute_complex_long_double.h	2013-03-30 20:12:56 +0000
+++ permutation/gsl_permute_complex_long_double.h	2013-03-30 20:59:11 +0000
@@ -25,21 +25,21 @@
 #include <gsl/gsl_complex.h>
 #include <gsl/gsl_permutation.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 int gsl_permute_complex_long_double (const size_t * p, long double * data, const size_t stride, const size_t n);
 int gsl_permute_complex_long_double_inverse (const size_t * p, long double * data, const size_t stride, const size_t n);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_PERMUTE_COMPLEX_LONG_DOUBLE_H */

=== modified file 'permutation/gsl_permute_double.h'
--- permutation/gsl_permute_double.h	2013-03-30 20:12:56 +0000
+++ permutation/gsl_permute_double.h	2013-03-30 20:59:11 +0000
@@ -24,21 +24,21 @@
 #include <gsl/gsl_errno.h>
 #include <gsl/gsl_permutation.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 int gsl_permute (const size_t * p, double * data, const size_t stride, const size_t n);
 int gsl_permute_inverse (const size_t * p, double * data, const size_t stride, const size_t n);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_PERMUTE_DOUBLE_H */

=== modified file 'permutation/gsl_permute_float.h'
--- permutation/gsl_permute_float.h	2013-03-30 20:12:56 +0000
+++ permutation/gsl_permute_float.h	2013-03-30 20:59:11 +0000
@@ -24,21 +24,21 @@
 #include <gsl/gsl_errno.h>
 #include <gsl/gsl_permutation.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 int gsl_permute_float (const size_t * p, float * data, const size_t stride, const size_t n);
 int gsl_permute_float_inverse (const size_t * p, float * data, const size_t stride, const size_t n);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_PERMUTE_FLOAT_H */

=== modified file 'permutation/gsl_permute_int.h'
--- permutation/gsl_permute_int.h	2013-03-30 20:12:56 +0000
+++ permutation/gsl_permute_int.h	2013-03-30 20:59:11 +0000
@@ -24,21 +24,21 @@
 #include <gsl/gsl_errno.h>
 #include <gsl/gsl_permutation.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 int gsl_permute_int (const size_t * p, int * data, const size_t stride, const size_t n);
 int gsl_permute_int_inverse (const size_t * p, int * data, const size_t stride, const size_t n);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_PERMUTE_INT_H */

=== modified file 'permutation/gsl_permute_long.h'
--- permutation/gsl_permute_long.h	2013-03-30 20:12:56 +0000
+++ permutation/gsl_permute_long.h	2013-03-30 20:59:11 +0000
@@ -24,21 +24,21 @@
 #include <gsl/gsl_errno.h>
 #include <gsl/gsl_permutation.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 int gsl_permute_long (const size_t * p, long * data, const size_t stride, const size_t n);
 int gsl_permute_long_inverse (const size_t * p, long * data, const size_t stride, const size_t n);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_PERMUTE_LONG_H */

=== modified file 'permutation/gsl_permute_long_double.h'
--- permutation/gsl_permute_long_double.h	2013-03-30 20:12:56 +0000
+++ permutation/gsl_permute_long_double.h	2013-03-30 20:59:11 +0000
@@ -24,21 +24,21 @@
 #include <gsl/gsl_errno.h>
 #include <gsl/gsl_permutation.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 int gsl_permute_long_double (const size_t * p, long double * data, const size_t stride, const size_t n);
 int gsl_permute_long_double_inverse (const size_t * p, long double * data, const size_t stride, const size_t n);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_PERMUTE_LONG_DOUBLE_H */

=== modified file 'permutation/gsl_permute_short.h'
--- permutation/gsl_permute_short.h	2013-03-30 20:12:56 +0000
+++ permutation/gsl_permute_short.h	2013-03-30 20:59:11 +0000
@@ -24,21 +24,21 @@
 #include <gsl/gsl_errno.h>
 #include <gsl/gsl_permutation.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 int gsl_permute_short (const size_t * p, short * data, const size_t stride, const size_t n);
 int gsl_permute_short_inverse (const size_t * p, short * data, const size_t stride, const size_t n);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_PERMUTE_SHORT_H */

=== modified file 'permutation/gsl_permute_uchar.h'
--- permutation/gsl_permute_uchar.h	2013-03-30 20:12:56 +0000
+++ permutation/gsl_permute_uchar.h	2013-03-30 20:59:11 +0000
@@ -24,21 +24,21 @@
 #include <gsl/gsl_errno.h>
 #include <gsl/gsl_permutation.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 int gsl_permute_uchar (const size_t * p, unsigned char * data, const size_t stride, const size_t n);
 int gsl_permute_uchar_inverse (const size_t * p, unsigned char * data, const size_t stride, const size_t n);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_PERMUTE_UCHAR_H */

=== modified file 'permutation/gsl_permute_uint.h'
--- permutation/gsl_permute_uint.h	2013-03-30 20:12:56 +0000
+++ permutation/gsl_permute_uint.h	2013-03-30 20:59:11 +0000
@@ -24,21 +24,21 @@
 #include <gsl/gsl_errno.h>
 #include <gsl/gsl_permutation.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 int gsl_permute_uint (const size_t * p, unsigned int * data, const size_t stride, const size_t n);
 int gsl_permute_uint_inverse (const size_t * p, unsigned int * data, const size_t stride, const size_t n);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_PERMUTE_UINT_H */

=== modified file 'permutation/gsl_permute_ulong.h'
--- permutation/gsl_permute_ulong.h	2013-03-30 20:12:56 +0000
+++ permutation/gsl_permute_ulong.h	2013-03-30 20:59:11 +0000
@@ -24,21 +24,21 @@
 #include <gsl/gsl_errno.h>
 #include <gsl/gsl_permutation.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 int gsl_permute_ulong (const size_t * p, unsigned long * data, const size_t stride, const size_t n);
 int gsl_permute_ulong_inverse (const size_t * p, unsigned long * data, const size_t stride, const size_t n);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_PERMUTE_ULONG_H */

=== modified file 'permutation/gsl_permute_ushort.h'
--- permutation/gsl_permute_ushort.h	2013-03-30 20:12:56 +0000
+++ permutation/gsl_permute_ushort.h	2013-03-30 20:59:11 +0000
@@ -24,21 +24,21 @@
 #include <gsl/gsl_errno.h>
 #include <gsl/gsl_permutation.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 int gsl_permute_ushort (const size_t * p, unsigned short * data, const size_t stride, const size_t n);
 int gsl_permute_ushort_inverse (const size_t * p, unsigned short * data, const size_t stride, const size_t n);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_PERMUTE_USHORT_H */

=== modified file 'permutation/gsl_permute_vector_char.h'
--- permutation/gsl_permute_vector_char.h	2013-03-30 20:12:56 +0000
+++ permutation/gsl_permute_vector_char.h	2013-03-30 20:59:11 +0000
@@ -25,21 +25,21 @@
 #include <gsl/gsl_permutation.h>
 #include <gsl/gsl_vector_char.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 int gsl_permute_vector_char (const gsl_permutation * p, gsl_vector_char * v);
 int gsl_permute_vector_char_inverse (const gsl_permutation * p, gsl_vector_char * v);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_PERMUTE_VECTOR_CHAR_H */

=== modified file 'permutation/gsl_permute_vector_complex_double.h'
--- permutation/gsl_permute_vector_complex_double.h	2013-03-30 20:12:56 +0000
+++ permutation/gsl_permute_vector_complex_double.h	2013-03-30 20:59:11 +0000
@@ -25,21 +25,21 @@
 #include <gsl/gsl_permutation.h>
 #include <gsl/gsl_vector_complex_double.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 int gsl_permute_vector_complex (const gsl_permutation * p, gsl_vector_complex * v);
 int gsl_permute_vector_complex_inverse (const gsl_permutation * p, gsl_vector_complex * v);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_PERMUTE_VECTOR_COMPLEX_DOUBLE_H */

=== modified file 'permutation/gsl_permute_vector_complex_float.h'
--- permutation/gsl_permute_vector_complex_float.h	2013-03-30 20:12:56 +0000
+++ permutation/gsl_permute_vector_complex_float.h	2013-03-30 20:59:11 +0000
@@ -25,21 +25,21 @@
 #include <gsl/gsl_permutation.h>
 #include <gsl/gsl_vector_complex_float.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 int gsl_permute_vector_complex_float (const gsl_permutation * p, gsl_vector_complex_float * v);
 int gsl_permute_vector_complex_float_inverse (const gsl_permutation * p, gsl_vector_complex_float * v);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_PERMUTE_VECTOR_COMPLEX_FLOAT_H */

=== modified file 'permutation/gsl_permute_vector_complex_long_double.h'
--- permutation/gsl_permute_vector_complex_long_double.h	2013-03-30 20:12:56 +0000
+++ permutation/gsl_permute_vector_complex_long_double.h	2013-03-30 20:59:11 +0000
@@ -25,21 +25,21 @@
 #include <gsl/gsl_permutation.h>
 #include <gsl/gsl_vector_complex_long_double.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 int gsl_permute_vector_complex_long_double (const gsl_permutation * p, gsl_vector_complex_long_double * v);
 int gsl_permute_vector_complex_long_double_inverse (const gsl_permutation * p, gsl_vector_complex_long_double * v);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_PERMUTE_VECTOR_COMPLEX_LONG_DOUBLE_H */

=== modified file 'permutation/gsl_permute_vector_double.h'
--- permutation/gsl_permute_vector_double.h	2013-03-30 20:12:56 +0000
+++ permutation/gsl_permute_vector_double.h	2013-03-30 20:59:11 +0000
@@ -25,21 +25,21 @@
 #include <gsl/gsl_permutation.h>
 #include <gsl/gsl_vector_double.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 int gsl_permute_vector (const gsl_permutation * p, gsl_vector * v);
 int gsl_permute_vector_inverse (const gsl_permutation * p, gsl_vector * v);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_PERMUTE_VECTOR_DOUBLE_H */

=== modified file 'permutation/gsl_permute_vector_float.h'
--- permutation/gsl_permute_vector_float.h	2013-03-30 20:12:56 +0000
+++ permutation/gsl_permute_vector_float.h	2013-03-30 20:59:11 +0000
@@ -25,21 +25,21 @@
 #include <gsl/gsl_permutation.h>
 #include <gsl/gsl_vector_float.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 int gsl_permute_vector_float (const gsl_permutation * p, gsl_vector_float * v);
 int gsl_permute_vector_float_inverse (const gsl_permutation * p, gsl_vector_float * v);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_PERMUTE_VECTOR_FLOAT_H */

=== modified file 'permutation/gsl_permute_vector_int.h'
--- permutation/gsl_permute_vector_int.h	2013-03-30 20:12:56 +0000
+++ permutation/gsl_permute_vector_int.h	2013-03-30 20:59:11 +0000
@@ -25,21 +25,21 @@
 #include <gsl/gsl_permutation.h>
 #include <gsl/gsl_vector_int.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 int gsl_permute_vector_int (const gsl_permutation * p, gsl_vector_int * v);
 int gsl_permute_vector_int_inverse (const gsl_permutation * p, gsl_vector_int * v);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_PERMUTE_VECTOR_INT_H */

=== modified file 'permutation/gsl_permute_vector_long.h'
--- permutation/gsl_permute_vector_long.h	2013-03-30 20:12:56 +0000
+++ permutation/gsl_permute_vector_long.h	2013-03-30 20:59:11 +0000
@@ -25,21 +25,21 @@
 #include <gsl/gsl_permutation.h>
 #include <gsl/gsl_vector_long.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 int gsl_permute_vector_long (const gsl_permutation * p, gsl_vector_long * v);
 int gsl_permute_vector_long_inverse (const gsl_permutation * p, gsl_vector_long * v);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_PERMUTE_VECTOR_LONG_H */

=== modified file 'permutation/gsl_permute_vector_long_double.h'
--- permutation/gsl_permute_vector_long_double.h	2013-03-30 20:12:56 +0000
+++ permutation/gsl_permute_vector_long_double.h	2013-03-30 20:59:11 +0000
@@ -25,21 +25,21 @@
 #include <gsl/gsl_permutation.h>
 #include <gsl/gsl_vector_long_double.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 int gsl_permute_vector_long_double (const gsl_permutation * p, gsl_vector_long_double * v);
 int gsl_permute_vector_long_double_inverse (const gsl_permutation * p, gsl_vector_long_double * v);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_PERMUTE_VECTOR_LONG_DOUBLE_H */

=== modified file 'permutation/gsl_permute_vector_short.h'
--- permutation/gsl_permute_vector_short.h	2013-03-30 20:12:56 +0000
+++ permutation/gsl_permute_vector_short.h	2013-03-30 20:59:11 +0000
@@ -25,21 +25,21 @@
 #include <gsl/gsl_permutation.h>
 #include <gsl/gsl_vector_short.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 int gsl_permute_vector_short (const gsl_permutation * p, gsl_vector_short * v);
 int gsl_permute_vector_short_inverse (const gsl_permutation * p, gsl_vector_short * v);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_PERMUTE_VECTOR_SHORT_H */

=== modified file 'permutation/gsl_permute_vector_uchar.h'
--- permutation/gsl_permute_vector_uchar.h	2013-03-30 20:12:56 +0000
+++ permutation/gsl_permute_vector_uchar.h	2013-03-30 20:59:11 +0000
@@ -25,21 +25,21 @@
 #include <gsl/gsl_permutation.h>
 #include <gsl/gsl_vector_uchar.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 int gsl_permute_vector_uchar (const gsl_permutation * p, gsl_vector_uchar * v);
 int gsl_permute_vector_uchar_inverse (const gsl_permutation * p, gsl_vector_uchar * v);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_PERMUTE_VECTOR_UCHAR_H */

=== modified file 'permutation/gsl_permute_vector_uint.h'
--- permutation/gsl_permute_vector_uint.h	2013-03-30 20:12:56 +0000
+++ permutation/gsl_permute_vector_uint.h	2013-03-30 20:59:11 +0000
@@ -25,21 +25,21 @@
 #include <gsl/gsl_permutation.h>
 #include <gsl/gsl_vector_uint.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 int gsl_permute_vector_uint (const gsl_permutation * p, gsl_vector_uint * v);
 int gsl_permute_vector_uint_inverse (const gsl_permutation * p, gsl_vector_uint * v);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_PERMUTE_VECTOR_UINT_H */

=== modified file 'permutation/gsl_permute_vector_ulong.h'
--- permutation/gsl_permute_vector_ulong.h	2013-03-30 20:12:56 +0000
+++ permutation/gsl_permute_vector_ulong.h	2013-03-30 20:59:11 +0000
@@ -25,21 +25,21 @@
 #include <gsl/gsl_permutation.h>
 #include <gsl/gsl_vector_ulong.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 int gsl_permute_vector_ulong (const gsl_permutation * p, gsl_vector_ulong * v);
 int gsl_permute_vector_ulong_inverse (const gsl_permutation * p, gsl_vector_ulong * v);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_PERMUTE_VECTOR_ULONG_H */

=== modified file 'permutation/gsl_permute_vector_ushort.h'
--- permutation/gsl_permute_vector_ushort.h	2013-03-30 20:12:56 +0000
+++ permutation/gsl_permute_vector_ushort.h	2013-03-30 20:59:11 +0000
@@ -25,21 +25,21 @@
 #include <gsl/gsl_permutation.h>
 #include <gsl/gsl_vector_ushort.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 int gsl_permute_vector_ushort (const gsl_permutation * p, gsl_vector_ushort * v);
 int gsl_permute_vector_ushort_inverse (const gsl_permutation * p, gsl_vector_ushort * v);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_PERMUTE_VECTOR_USHORT_H */

=== modified file 'poly/gsl_poly.h'
--- poly/gsl_poly.h	2013-03-30 20:12:56 +0000
+++ poly/gsl_poly.h	2013-03-30 20:59:11 +0000
@@ -24,17 +24,17 @@
 #include <gsl/gsl_inline.h>
 #include <gsl/gsl_complex.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 
 /* Evaluate polynomial
@@ -174,6 +174,6 @@
                         gsl_poly_complex_workspace * w,
                         gsl_complex_packed_ptr z);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_POLY_H */

=== modified file 'qrng/gsl_qrng.h'
--- qrng/gsl_qrng.h	2013-03-30 20:12:56 +0000
+++ qrng/gsl_qrng.h	2013-03-30 20:59:11 +0000
@@ -8,17 +8,17 @@
 #include <gsl/gsl_errno.h>
 #include <gsl/gsl_inline.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 
 /* Once again, more inane C-style OOP... kill me now. */
@@ -105,7 +105,7 @@
 #endif /* HAVE_INLINE */
 
 
-__END_DECLS
+GSL_END_DECLS
 
 
 #endif /* !GSL_QRNG_H */

=== modified file 'randist/gsl_randist.h'
--- randist/gsl_randist.h	2013-03-30 20:12:56 +0000
+++ randist/gsl_randist.h	2013-03-30 20:59:11 +0000
@@ -21,17 +21,17 @@
 #define GSL_RANDIST_H
 #include <gsl/gsl_rng.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 unsigned int gsl_ran_bernoulli (const gsl_rng * r, double p);
 double gsl_ran_bernoulli_pdf (const unsigned int k, double p);
@@ -180,6 +180,6 @@
 double gsl_ran_discrete_pdf (size_t k, const gsl_ran_discrete_t *g);
 
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_RANDIST_H */

=== modified file 'rng/gsl_rng.h'
--- rng/gsl_rng.h	2013-03-30 20:12:56 +0000
+++ rng/gsl_rng.h	2013-03-30 20:59:11 +0000
@@ -24,17 +24,17 @@
 #include <gsl/gsl_errno.h>
 #include <gsl/gsl_inline.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 typedef struct
   {
@@ -212,6 +212,6 @@
 }
 #endif /* HAVE_INLINE */
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_RNG_H */

=== modified file 'roots/gsl_roots.h'
--- roots/gsl_roots.h	2013-03-30 20:12:56 +0000
+++ roots/gsl_roots.h	2013-03-30 20:59:11 +0000
@@ -24,17 +24,17 @@
 #include <gsl/gsl_types.h>
 #include <gsl/gsl_math.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 typedef struct
   {
@@ -122,6 +122,6 @@
 GSL_VAR const gsl_root_fdfsolver_type  * gsl_root_fdfsolver_secant;
 GSL_VAR const gsl_root_fdfsolver_type  * gsl_root_fdfsolver_steffenson;
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_ROOTS_H */

=== modified file 'siman/gsl_siman.h'
--- siman/gsl_siman.h	2013-03-30 20:12:56 +0000
+++ siman/gsl_siman.h	2013-03-30 20:59:11 +0000
@@ -22,17 +22,17 @@
 #include <stdlib.h>
 #include <gsl/gsl_rng.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 /* types for the function pointers passed to gsl_siman_solve */
 
@@ -77,6 +77,6 @@
                       size_t element_size,
                       gsl_siman_params_t params);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_SIMAN_H */

=== modified file 'sort/gsl_heapsort.h'
--- sort/gsl_heapsort.h	2013-03-30 20:12:56 +0000
+++ sort/gsl_heapsort.h	2013-03-30 20:59:11 +0000
@@ -22,23 +22,23 @@
 
 #include <gsl/gsl_permutation.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 typedef int (*gsl_comparison_fn_t) (const void *, const void *);
 
 void gsl_heapsort (void * array, size_t count, size_t size, gsl_comparison_fn_t compare);
 int gsl_heapsort_index (size_t * p, const void * array, size_t count, size_t size, gsl_comparison_fn_t compare);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_HEAPSORT_H */

=== modified file 'sort/gsl_sort_char.h'
--- sort/gsl_sort_char.h	2013-03-30 20:12:56 +0000
+++ sort/gsl_sort_char.h	2013-03-30 20:59:11 +0000
@@ -24,17 +24,17 @@
 #include <gsl/gsl_errno.h>
 #include <gsl/gsl_permutation.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 void gsl_sort_char (char * data, const size_t stride, const size_t n);
 void gsl_sort_char_index (size_t * p, const char * data, const size_t stride, const size_t n);
@@ -45,6 +45,6 @@
 int gsl_sort_char_largest (char * dest, const size_t k, const char * src, const size_t stride, const size_t n);
 int gsl_sort_char_largest_index (size_t * p, const size_t k, const char * src, const size_t stride, const size_t n);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_SORT_CHAR_H */

=== modified file 'sort/gsl_sort_double.h'
--- sort/gsl_sort_double.h	2013-03-30 20:12:56 +0000
+++ sort/gsl_sort_double.h	2013-03-30 20:59:11 +0000
@@ -24,17 +24,17 @@
 #include <gsl/gsl_errno.h>
 #include <gsl/gsl_permutation.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 void gsl_sort (double * data, const size_t stride, const size_t n);
 void gsl_sort_index (size_t * p, const double * data, const size_t stride, const size_t n);
@@ -45,6 +45,6 @@
 int gsl_sort_largest (double * dest, const size_t k, const double * src, const size_t stride, const size_t n);
 int gsl_sort_largest_index (size_t * p, const size_t k, const double * src, const size_t stride, const size_t n);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_SORT_DOUBLE_H */

=== modified file 'sort/gsl_sort_float.h'
--- sort/gsl_sort_float.h	2013-03-30 20:12:56 +0000
+++ sort/gsl_sort_float.h	2013-03-30 20:59:11 +0000
@@ -24,17 +24,17 @@
 #include <gsl/gsl_errno.h>
 #include <gsl/gsl_permutation.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 void gsl_sort_float (float * data, const size_t stride, const size_t n);
 void gsl_sort_float_index (size_t * p, const float * data, const size_t stride, const size_t n);
@@ -45,6 +45,6 @@
 int gsl_sort_float_largest (float * dest, const size_t k, const float * src, const size_t stride, const size_t n);
 int gsl_sort_float_largest_index (size_t * p, const size_t k, const float * src, const size_t stride, const size_t n);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_SORT_FLOAT_H */

=== modified file 'sort/gsl_sort_int.h'
--- sort/gsl_sort_int.h	2013-03-30 20:12:56 +0000
+++ sort/gsl_sort_int.h	2013-03-30 20:59:11 +0000
@@ -24,17 +24,17 @@
 #include <gsl/gsl_errno.h>
 #include <gsl/gsl_permutation.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 void gsl_sort_int (int * data, const size_t stride, const size_t n);
 void gsl_sort_int_index (size_t * p, const int * data, const size_t stride, const size_t n);
@@ -45,6 +45,6 @@
 int gsl_sort_int_largest (int * dest, const size_t k, const int * src, const size_t stride, const size_t n);
 int gsl_sort_int_largest_index (size_t * p, const size_t k, const int * src, const size_t stride, const size_t n);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_SORT_INT_H */

=== modified file 'sort/gsl_sort_long.h'
--- sort/gsl_sort_long.h	2013-03-30 20:12:56 +0000
+++ sort/gsl_sort_long.h	2013-03-30 20:59:11 +0000
@@ -24,17 +24,17 @@
 #include <gsl/gsl_errno.h>
 #include <gsl/gsl_permutation.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 void gsl_sort_long (long * data, const size_t stride, const size_t n);
 void gsl_sort_long_index (size_t * p, const long * data, const size_t stride, const size_t n);
@@ -45,6 +45,6 @@
 int gsl_sort_long_largest (long * dest, const size_t k, const long * src, const size_t stride, const size_t n);
 int gsl_sort_long_largest_index (size_t * p, const size_t k, const long * src, const size_t stride, const size_t n);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_SORT_LONG_H */

=== modified file 'sort/gsl_sort_long_double.h'
--- sort/gsl_sort_long_double.h	2013-03-30 20:12:56 +0000
+++ sort/gsl_sort_long_double.h	2013-03-30 20:59:11 +0000
@@ -24,17 +24,17 @@
 #include <gsl/gsl_errno.h>
 #include <gsl/gsl_permutation.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 void gsl_sort_long_double (long double * data, const size_t stride, const size_t n);
 void gsl_sort_long_double_index (size_t * p, const long double * data, const size_t stride, const size_t n);
@@ -45,6 +45,6 @@
 int gsl_sort_long_double_largest (long double * dest, const size_t k, const long double * src, const size_t stride, const size_t n);
 int gsl_sort_long_double_largest_index (size_t * p, const size_t k, const long double * src, const size_t stride, const size_t n);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_SORT_LONG_DOUBLE_H */

=== modified file 'sort/gsl_sort_short.h'
--- sort/gsl_sort_short.h	2013-03-30 20:12:56 +0000
+++ sort/gsl_sort_short.h	2013-03-30 20:59:11 +0000
@@ -24,17 +24,17 @@
 #include <gsl/gsl_errno.h>
 #include <gsl/gsl_permutation.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 void gsl_sort_short (short * data, const size_t stride, const size_t n);
 void gsl_sort_short_index (size_t * p, const short * data, const size_t stride, const size_t n);
@@ -45,6 +45,6 @@
 int gsl_sort_short_largest (short * dest, const size_t k, const short * src, const size_t stride, const size_t n);
 int gsl_sort_short_largest_index (size_t * p, const size_t k, const short * src, const size_t stride, const size_t n);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_SORT_SHORT_H */

=== modified file 'sort/gsl_sort_uchar.h'
--- sort/gsl_sort_uchar.h	2013-03-30 20:12:56 +0000
+++ sort/gsl_sort_uchar.h	2013-03-30 20:59:11 +0000
@@ -24,17 +24,17 @@
 #include <gsl/gsl_errno.h>
 #include <gsl/gsl_permutation.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 void gsl_sort_uchar (unsigned char * data, const size_t stride, const size_t n);
 void gsl_sort_uchar_index (size_t * p, const unsigned char * data, const size_t stride, const size_t n);
@@ -45,6 +45,6 @@
 int gsl_sort_uchar_largest (unsigned char * dest, const size_t k, const unsigned char * src, const size_t stride, const size_t n);
 int gsl_sort_uchar_largest_index (size_t * p, const size_t k, const unsigned char * src, const size_t stride, const size_t n);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_SORT_UCHAR_H */

=== modified file 'sort/gsl_sort_uint.h'
--- sort/gsl_sort_uint.h	2013-03-30 20:12:56 +0000
+++ sort/gsl_sort_uint.h	2013-03-30 20:59:11 +0000
@@ -24,17 +24,17 @@
 #include <gsl/gsl_errno.h>
 #include <gsl/gsl_permutation.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 void gsl_sort_uint (unsigned int * data, const size_t stride, const size_t n);
 void gsl_sort_uint_index (size_t * p, const unsigned int * data, const size_t stride, const size_t n);
@@ -45,6 +45,6 @@
 int gsl_sort_uint_largest (unsigned int * dest, const size_t k, const unsigned int * src, const size_t stride, const size_t n);
 int gsl_sort_uint_largest_index (size_t * p, const size_t k, const unsigned int * src, const size_t stride, const size_t n);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_SORT_UINT_H */

=== modified file 'sort/gsl_sort_ulong.h'
--- sort/gsl_sort_ulong.h	2013-03-30 20:12:56 +0000
+++ sort/gsl_sort_ulong.h	2013-03-30 20:59:11 +0000
@@ -24,17 +24,17 @@
 #include <gsl/gsl_errno.h>
 #include <gsl/gsl_permutation.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 void gsl_sort_ulong (unsigned long * data, const size_t stride, const size_t n);
 void gsl_sort_ulong_index (size_t * p, const unsigned long * data, const size_t stride, const size_t n);
@@ -45,6 +45,6 @@
 int gsl_sort_ulong_largest (unsigned long * dest, const size_t k, const unsigned long * src, const size_t stride, const size_t n);
 int gsl_sort_ulong_largest_index (size_t * p, const size_t k, const unsigned long * src, const size_t stride, const size_t n);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_SORT_ULONG_H */

=== modified file 'sort/gsl_sort_ushort.h'
--- sort/gsl_sort_ushort.h	2013-03-30 20:12:56 +0000
+++ sort/gsl_sort_ushort.h	2013-03-30 20:59:11 +0000
@@ -24,17 +24,17 @@
 #include <gsl/gsl_errno.h>
 #include <gsl/gsl_permutation.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 void gsl_sort_ushort (unsigned short * data, const size_t stride, const size_t n);
 void gsl_sort_ushort_index (size_t * p, const unsigned short * data, const size_t stride, const size_t n);
@@ -45,6 +45,6 @@
 int gsl_sort_ushort_largest (unsigned short * dest, const size_t k, const unsigned short * src, const size_t stride, const size_t n);
 int gsl_sort_ushort_largest_index (size_t * p, const size_t k, const unsigned short * src, const size_t stride, const size_t n);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_SORT_USHORT_H */

=== modified file 'sort/gsl_sort_vector_char.h'
--- sort/gsl_sort_vector_char.h	2013-03-30 20:12:56 +0000
+++ sort/gsl_sort_vector_char.h	2013-03-30 20:59:11 +0000
@@ -25,17 +25,17 @@
 #include <gsl/gsl_permutation.h>
 #include <gsl/gsl_vector_char.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 void gsl_sort_vector_char (gsl_vector_char * v);
 int gsl_sort_vector_char_index (gsl_permutation * p, const gsl_vector_char * v);
@@ -46,6 +46,6 @@
 int gsl_sort_vector_char_smallest_index (size_t * p, const size_t k, const gsl_vector_char * v);
 int gsl_sort_vector_char_largest_index (size_t * p, const size_t k, const gsl_vector_char * v);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_SORT_VECTOR_CHAR_H */

=== modified file 'sort/gsl_sort_vector_double.h'
--- sort/gsl_sort_vector_double.h	2013-03-30 20:12:56 +0000
+++ sort/gsl_sort_vector_double.h	2013-03-30 20:59:11 +0000
@@ -25,17 +25,17 @@
 #include <gsl/gsl_permutation.h>
 #include <gsl/gsl_vector_double.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 void gsl_sort_vector (gsl_vector * v);
 int gsl_sort_vector_index (gsl_permutation * p, const gsl_vector * v);
@@ -46,6 +46,6 @@
 int gsl_sort_vector_smallest_index (size_t * p, const size_t k, const gsl_vector * v);
 int gsl_sort_vector_largest_index (size_t * p, const size_t k, const gsl_vector * v);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_SORT_VECTOR_DOUBLE_H */

=== modified file 'sort/gsl_sort_vector_float.h'
--- sort/gsl_sort_vector_float.h	2013-03-30 20:12:56 +0000
+++ sort/gsl_sort_vector_float.h	2013-03-30 20:59:11 +0000
@@ -25,17 +25,17 @@
 #include <gsl/gsl_permutation.h>
 #include <gsl/gsl_vector_float.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 void gsl_sort_vector_float (gsl_vector_float * v);
 int gsl_sort_vector_float_index (gsl_permutation * p, const gsl_vector_float * v);
@@ -46,6 +46,6 @@
 int gsl_sort_vector_float_smallest_index (size_t * p, const size_t k, const gsl_vector_float * v);
 int gsl_sort_vector_float_largest_index (size_t * p, const size_t k, const gsl_vector_float * v);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_SORT_VECTOR_FLOAT_H */

=== modified file 'sort/gsl_sort_vector_int.h'
--- sort/gsl_sort_vector_int.h	2013-03-30 20:12:56 +0000
+++ sort/gsl_sort_vector_int.h	2013-03-30 20:59:11 +0000
@@ -25,17 +25,17 @@
 #include <gsl/gsl_permutation.h>
 #include <gsl/gsl_vector_int.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 void gsl_sort_vector_int (gsl_vector_int * v);
 int gsl_sort_vector_int_index (gsl_permutation * p, const gsl_vector_int * v);
@@ -46,6 +46,6 @@
 int gsl_sort_vector_int_smallest_index (size_t * p, const size_t k, const gsl_vector_int * v);
 int gsl_sort_vector_int_largest_index (size_t * p, const size_t k, const gsl_vector_int * v);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_SORT_VECTOR_INT_H */

=== modified file 'sort/gsl_sort_vector_long.h'
--- sort/gsl_sort_vector_long.h	2013-03-30 20:12:56 +0000
+++ sort/gsl_sort_vector_long.h	2013-03-30 20:59:11 +0000
@@ -25,17 +25,17 @@
 #include <gsl/gsl_permutation.h>
 #include <gsl/gsl_vector_long.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 void gsl_sort_vector_long (gsl_vector_long * v);
 int gsl_sort_vector_long_index (gsl_permutation * p, const gsl_vector_long * v);
@@ -46,6 +46,6 @@
 int gsl_sort_vector_long_smallest_index (size_t * p, const size_t k, const gsl_vector_long * v);
 int gsl_sort_vector_long_largest_index (size_t * p, const size_t k, const gsl_vector_long * v);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_SORT_VECTOR_LONG_H */

=== modified file 'sort/gsl_sort_vector_long_double.h'
--- sort/gsl_sort_vector_long_double.h	2013-03-30 20:12:56 +0000
+++ sort/gsl_sort_vector_long_double.h	2013-03-30 20:59:11 +0000
@@ -25,17 +25,17 @@
 #include <gsl/gsl_permutation.h>
 #include <gsl/gsl_vector_long_double.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 void gsl_sort_vector_long_double (gsl_vector_long_double * v);
 int gsl_sort_vector_long_double_index (gsl_permutation * p, const gsl_vector_long_double * v);
@@ -46,6 +46,6 @@
 int gsl_sort_vector_long_double_smallest_index (size_t * p, const size_t k, const gsl_vector_long_double * v);
 int gsl_sort_vector_long_double_largest_index (size_t * p, const size_t k, const gsl_vector_long_double * v);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_SORT_VECTOR_LONG_DOUBLE_H */

=== modified file 'sort/gsl_sort_vector_short.h'
--- sort/gsl_sort_vector_short.h	2013-03-30 20:12:56 +0000
+++ sort/gsl_sort_vector_short.h	2013-03-30 20:59:11 +0000
@@ -25,17 +25,17 @@
 #include <gsl/gsl_permutation.h>
 #include <gsl/gsl_vector_short.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 void gsl_sort_vector_short (gsl_vector_short * v);
 int gsl_sort_vector_short_index (gsl_permutation * p, const gsl_vector_short * v);
@@ -46,6 +46,6 @@
 int gsl_sort_vector_short_smallest_index (size_t * p, const size_t k, const gsl_vector_short * v);
 int gsl_sort_vector_short_largest_index (size_t * p, const size_t k, const gsl_vector_short * v);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_SORT_VECTOR_SHORT_H */

=== modified file 'sort/gsl_sort_vector_uchar.h'
--- sort/gsl_sort_vector_uchar.h	2013-03-30 20:12:56 +0000
+++ sort/gsl_sort_vector_uchar.h	2013-03-30 20:59:11 +0000
@@ -25,17 +25,17 @@
 #include <gsl/gsl_permutation.h>
 #include <gsl/gsl_vector_uchar.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 void gsl_sort_vector_uchar (gsl_vector_uchar * v);
 int gsl_sort_vector_uchar_index (gsl_permutation * p, const gsl_vector_uchar * v);
@@ -46,6 +46,6 @@
 int gsl_sort_vector_uchar_smallest_index (size_t * p, const size_t k, const gsl_vector_uchar * v);
 int gsl_sort_vector_uchar_largest_index (size_t * p, const size_t k, const gsl_vector_uchar * v);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_SORT_VECTOR_UCHAR_H */

=== modified file 'sort/gsl_sort_vector_uint.h'
--- sort/gsl_sort_vector_uint.h	2013-03-30 20:12:56 +0000
+++ sort/gsl_sort_vector_uint.h	2013-03-30 20:59:11 +0000
@@ -25,17 +25,17 @@
 #include <gsl/gsl_permutation.h>
 #include <gsl/gsl_vector_uint.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 void gsl_sort_vector_uint (gsl_vector_uint * v);
 int gsl_sort_vector_uint_index (gsl_permutation * p, const gsl_vector_uint * v);
@@ -46,6 +46,6 @@
 int gsl_sort_vector_uint_smallest_index (size_t * p, const size_t k, const gsl_vector_uint * v);
 int gsl_sort_vector_uint_largest_index (size_t * p, const size_t k, const gsl_vector_uint * v);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_SORT_VECTOR_UINT_H */

=== modified file 'sort/gsl_sort_vector_ulong.h'
--- sort/gsl_sort_vector_ulong.h	2013-03-30 20:12:56 +0000
+++ sort/gsl_sort_vector_ulong.h	2013-03-30 20:59:11 +0000
@@ -25,17 +25,17 @@
 #include <gsl/gsl_permutation.h>
 #include <gsl/gsl_vector_ulong.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 void gsl_sort_vector_ulong (gsl_vector_ulong * v);
 int gsl_sort_vector_ulong_index (gsl_permutation * p, const gsl_vector_ulong * v);
@@ -46,6 +46,6 @@
 int gsl_sort_vector_ulong_smallest_index (size_t * p, const size_t k, const gsl_vector_ulong * v);
 int gsl_sort_vector_ulong_largest_index (size_t * p, const size_t k, const gsl_vector_ulong * v);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_SORT_VECTOR_ULONG_H */

=== modified file 'sort/gsl_sort_vector_ushort.h'
--- sort/gsl_sort_vector_ushort.h	2013-03-30 20:12:56 +0000
+++ sort/gsl_sort_vector_ushort.h	2013-03-30 20:59:11 +0000
@@ -25,17 +25,17 @@
 #include <gsl/gsl_permutation.h>
 #include <gsl/gsl_vector_ushort.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 void gsl_sort_vector_ushort (gsl_vector_ushort * v);
 int gsl_sort_vector_ushort_index (gsl_permutation * p, const gsl_vector_ushort * v);
@@ -46,6 +46,6 @@
 int gsl_sort_vector_ushort_smallest_index (size_t * p, const size_t k, const gsl_vector_ushort * v);
 int gsl_sort_vector_ushort_largest_index (size_t * p, const size_t k, const gsl_vector_ushort * v);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_SORT_VECTOR_USHORT_H */

=== modified file 'specfunc/gsl_sf_airy.h'
--- specfunc/gsl_sf_airy.h	2013-03-30 20:12:56 +0000
+++ specfunc/gsl_sf_airy.h	2013-03-30 20:59:11 +0000
@@ -25,17 +25,17 @@
 #include <gsl/gsl_mode.h>
 #include <gsl/gsl_sf_result.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 
 /* Airy function Ai(x)
@@ -134,6 +134,6 @@
 double gsl_sf_airy_zero_Bi_deriv(unsigned int s);
 
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_SF_AIRY_H */

=== modified file 'specfunc/gsl_sf_bessel.h'
--- specfunc/gsl_sf_bessel.h	2013-03-30 20:12:56 +0000
+++ specfunc/gsl_sf_bessel.h	2013-03-30 20:59:11 +0000
@@ -27,17 +27,17 @@
 #include <gsl/gsl_precision.h>
 #include <gsl/gsl_sf_result.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 
 /* Regular Bessel Function J_0(x)
@@ -544,6 +544,6 @@
 double gsl_sf_bessel_zero_Jnu(double nu, unsigned int s);
 
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_SF_BESSEL_H */

=== modified file 'specfunc/gsl_sf_clausen.h'
--- specfunc/gsl_sf_clausen.h	2013-03-30 20:12:56 +0000
+++ specfunc/gsl_sf_clausen.h	2013-03-30 20:59:11 +0000
@@ -24,17 +24,17 @@
 
 #include <gsl/gsl_sf_result.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 
 /* Calculate the Clausen integral:
@@ -47,6 +47,6 @@
 double gsl_sf_clausen(const double x);
 
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_SF_CLAUSEN_H */

=== modified file 'specfunc/gsl_sf_coulomb.h'
--- specfunc/gsl_sf_coulomb.h	2013-03-30 20:12:56 +0000
+++ specfunc/gsl_sf_coulomb.h	2013-03-30 20:59:11 +0000
@@ -25,17 +25,17 @@
 #include <gsl/gsl_mode.h>
 #include <gsl/gsl_sf_result.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 
 /* Normalized hydrogenic bound states, radial dependence. */
@@ -123,6 +123,6 @@
 int gsl_sf_coulomb_CL_array(double Lmin, int kmax, double eta, double * cl);
 
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_SF_COULOMB_H */

=== modified file 'specfunc/gsl_sf_coupling.h'
--- specfunc/gsl_sf_coupling.h	2013-03-30 20:12:56 +0000
+++ specfunc/gsl_sf_coupling.h	2013-03-30 20:59:11 +0000
@@ -24,17 +24,17 @@
 
 #include <gsl/gsl_sf_result.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 
 /* 3j Symbols:  / ja jb jc \
@@ -120,6 +120,6 @@
 #endif /* !GSL_DISABLE_DEPRECATED */
 
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_SF_COUPLING_H */

=== modified file 'specfunc/gsl_sf_dawson.h'
--- specfunc/gsl_sf_dawson.h	2013-03-30 20:12:56 +0000
+++ specfunc/gsl_sf_dawson.h	2013-03-30 20:59:11 +0000
@@ -24,17 +24,17 @@
 
 #include <gsl/gsl_sf_result.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 
 /* Dawson's integral:
@@ -47,6 +47,6 @@
 double     gsl_sf_dawson(double x);
 
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_SF_DAWSON_H */

=== modified file 'specfunc/gsl_sf_debye.h'
--- specfunc/gsl_sf_debye.h	2013-03-30 20:12:56 +0000
+++ specfunc/gsl_sf_debye.h	2013-03-30 20:59:11 +0000
@@ -25,17 +25,17 @@
 
 #include <gsl/gsl_sf_result.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 
 /* D_n(x) := n/x^n Integrate[t^n/(e^t - 1), {t,0,x}] */
@@ -86,6 +86,6 @@
 double     gsl_sf_debye_6(const double x);
 
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_SF_DEBYE_H */

=== modified file 'specfunc/gsl_sf_dilog.h'
--- specfunc/gsl_sf_dilog.h	2013-03-30 20:12:56 +0000
+++ specfunc/gsl_sf_dilog.h	2013-03-30 20:59:11 +0000
@@ -24,17 +24,17 @@
 
 #include <gsl/gsl_sf_result.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 
 /* Real part of DiLogarithm(x), for real argument.
@@ -125,6 +125,6 @@
   );
 
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_SF_DILOG_H */

=== modified file 'specfunc/gsl_sf_elementary.h'
--- specfunc/gsl_sf_elementary.h	2013-03-30 20:12:56 +0000
+++ specfunc/gsl_sf_elementary.h	2013-03-30 20:59:11 +0000
@@ -26,17 +26,17 @@
 
 #include <gsl/gsl_sf_result.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 
 /* Multiplication.
@@ -52,6 +52,6 @@
 int gsl_sf_multiply_err_e(const double x, const double dx, const double y, const double dy, gsl_sf_result * result);
 
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_SF_ELEMENTARY_H */

=== modified file 'specfunc/gsl_sf_ellint.h'
--- specfunc/gsl_sf_ellint.h	2013-03-30 20:12:56 +0000
+++ specfunc/gsl_sf_ellint.h	2013-03-30 20:59:11 +0000
@@ -25,17 +25,17 @@
 #include <gsl/gsl_mode.h>
 #include <gsl/gsl_sf_result.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 
 /* Legendre form of complete elliptic integrals
@@ -107,6 +107,6 @@
 double gsl_sf_ellint_RJ(double x, double y, double z, double p, gsl_mode_t mode);
 
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_SF_ELLINT_H */

=== modified file 'specfunc/gsl_sf_elljac.h'
--- specfunc/gsl_sf_elljac.h	2013-03-30 20:12:56 +0000
+++ specfunc/gsl_sf_elljac.h	2013-03-30 20:59:11 +0000
@@ -22,17 +22,17 @@
 #ifndef GSL_SF_ELLJAC_H
 #define GSL_SF_ELLJAC_H
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 
 /* Jacobian elliptic functions sn, dn, cn,
@@ -43,6 +43,6 @@
 int gsl_sf_elljac_e(double u, double m, double * sn, double * cn, double * dn);
 
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_SF_ELLJAC_H */

=== modified file 'specfunc/gsl_sf_erf.h'
--- specfunc/gsl_sf_erf.h	2013-03-30 20:12:56 +0000
+++ specfunc/gsl_sf_erf.h	2013-03-30 20:59:11 +0000
@@ -24,17 +24,17 @@
 
 #include <gsl/gsl_sf_result.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 
 /* Complementary Error Function
@@ -86,6 +86,6 @@
 double gsl_sf_hazard(double x);
 
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_SF_ERF_H */

=== modified file 'specfunc/gsl_sf_exp.h'
--- specfunc/gsl_sf_exp.h	2013-03-30 20:12:56 +0000
+++ specfunc/gsl_sf_exp.h	2013-03-30 20:59:11 +0000
@@ -25,17 +25,17 @@
 #include <gsl/gsl_sf_result.h>
 #include <gsl/gsl_precision.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 /* Provide an exp() function with GSL semantics,
  * i.e. with proper error checking, etc.
@@ -129,6 +129,6 @@
  */
 int gsl_sf_exp_mult_err_e10_e(const double x, const double dx, const double y, const double dy, gsl_sf_result_e10 * result);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_SF_EXP_H */

=== modified file 'specfunc/gsl_sf_expint.h'
--- specfunc/gsl_sf_expint.h	2013-03-30 20:12:56 +0000
+++ specfunc/gsl_sf_expint.h	2013-03-30 20:59:11 +0000
@@ -25,17 +25,17 @@
 
 #include <gsl/gsl_sf_result.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 
 /* E_1(x) := Re[ Integrate[ Exp[-xt]/t, {t,1,Infinity}] ]
@@ -162,6 +162,6 @@
 double  gsl_sf_atanint(const double x);
 
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_SF_EXPINT_H */

=== modified file 'specfunc/gsl_sf_fermi_dirac.h'
--- specfunc/gsl_sf_fermi_dirac.h	2013-03-30 20:12:56 +0000
+++ specfunc/gsl_sf_fermi_dirac.h	2013-03-30 20:59:11 +0000
@@ -24,17 +24,17 @@
 
 #include <gsl/gsl_sf_result.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 
 /* Complete Fermi-Dirac Integrals:
@@ -121,6 +121,6 @@
 double     gsl_sf_fermi_dirac_inc_0(const double x, const double b);
 
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_SF_FERMI_DIRAC_H */

=== modified file 'specfunc/gsl_sf_gamma.h'
--- specfunc/gsl_sf_gamma.h	2013-03-30 20:12:56 +0000
+++ specfunc/gsl_sf_gamma.h	2013-03-30 20:59:11 +0000
@@ -24,17 +24,17 @@
 
 #include <gsl/gsl_sf_result.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 
 /* Log[Gamma(x)], x not a negative integer
@@ -288,6 +288,6 @@
 /* The maximum n such that gsl_sf_doublefact(n) does not give an overflow. */
 #define GSL_SF_DOUBLEFACT_NMAX 297
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_SF_GAMMA_H */

=== modified file 'specfunc/gsl_sf_gegenbauer.h'
--- specfunc/gsl_sf_gegenbauer.h	2013-03-30 20:12:56 +0000
+++ specfunc/gsl_sf_gegenbauer.h	2013-03-30 20:59:11 +0000
@@ -24,17 +24,17 @@
 
 #include <gsl/gsl_sf_result.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 
 /* Evaluate Gegenbauer polynomials
@@ -68,6 +68,6 @@
 int gsl_sf_gegenpoly_array(int nmax, double lambda, double x, double * result_array);
 
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_SF_GEGENBAUER_H */

=== modified file 'specfunc/gsl_sf_hyperg.h'
--- specfunc/gsl_sf_hyperg.h	2013-03-30 20:12:56 +0000
+++ specfunc/gsl_sf_hyperg.h	2013-03-30 20:59:11 +0000
@@ -24,17 +24,17 @@
 
 #include <gsl/gsl_sf_result.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 
 /* Hypergeometric function related to Bessel functions
@@ -149,6 +149,6 @@
 double     gsl_sf_hyperg_2F0(const double a, const double b, const double x);
 
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_SF_HYPERG_H */

=== modified file 'specfunc/gsl_sf_laguerre.h'
--- specfunc/gsl_sf_laguerre.h	2013-03-30 20:12:56 +0000
+++ specfunc/gsl_sf_laguerre.h	2013-03-30 20:59:11 +0000
@@ -24,17 +24,17 @@
 
 #include <gsl/gsl_sf_result.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 
 /* L^a_n(x) = (a+1)_n / n! 1F1(-n,a+1,x) */
@@ -63,6 +63,6 @@
 double     gsl_sf_laguerre_n(int n, double a, double x);
 
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_SF_LAGUERRE_H */

=== modified file 'specfunc/gsl_sf_lambert.h'
--- specfunc/gsl_sf_lambert.h	2013-03-30 20:12:56 +0000
+++ specfunc/gsl_sf_lambert.h	2013-03-30 20:59:11 +0000
@@ -24,17 +24,17 @@
 
 #include <gsl/gsl_sf_result.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 
 /* Lambert's Function W_0(x)
@@ -64,6 +64,6 @@
 double  gsl_sf_lambert_Wm1(double x);
 
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_SF_LAMBERT_H */

=== modified file 'specfunc/gsl_sf_legendre.h'
--- specfunc/gsl_sf_legendre.h	2013-03-30 20:12:56 +0000
+++ specfunc/gsl_sf_legendre.h	2013-03-30 20:59:11 +0000
@@ -24,17 +24,17 @@
 
 #include <gsl/gsl_sf_result.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 
 /* P_l(x)   l >= 0; |x| <= 1
@@ -310,6 +310,6 @@
 int gsl_sf_legendre_H3d_array(const int lmax, const double lambda, const double eta, double * result_array);
 
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_SF_LEGENDRE_H */

=== modified file 'specfunc/gsl_sf_log.h'
--- specfunc/gsl_sf_log.h	2013-03-30 20:12:56 +0000
+++ specfunc/gsl_sf_log.h	2013-03-30 20:59:11 +0000
@@ -24,17 +24,17 @@
 
 #include <gsl/gsl_sf_result.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 
 /* Provide a logarithm function with GSL semantics.
@@ -77,6 +77,6 @@
 int gsl_sf_log_1plusx_mx_e(const double x, gsl_sf_result * result);
 double gsl_sf_log_1plusx_mx(const double x);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_SF_LOG_H */

=== modified file 'specfunc/gsl_sf_mathieu.h'
--- specfunc/gsl_sf_mathieu.h	2013-03-30 20:12:56 +0000
+++ specfunc/gsl_sf_mathieu.h	2013-03-30 20:59:11 +0000
@@ -25,17 +25,17 @@
 #include <gsl/gsl_sf_result.h>
 #include <gsl/gsl_eigen.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 #define GSL_SF_MATHIEU_COEFF 100
 
@@ -102,6 +102,6 @@
                             double result_array[]);
 
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* !GSL_SF_MATHIEU_H */

=== modified file 'specfunc/gsl_sf_pow_int.h'
--- specfunc/gsl_sf_pow_int.h	2013-03-30 20:12:56 +0000
+++ specfunc/gsl_sf_pow_int.h	2013-03-30 20:59:11 +0000
@@ -24,17 +24,17 @@
 
 #include <gsl/gsl_sf_result.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 
 /* Calculate x^n.
@@ -44,6 +44,6 @@
 double  gsl_sf_pow_int(const double x, const int n);
 
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_SF_POW_INT_H */

=== modified file 'specfunc/gsl_sf_psi.h'
--- specfunc/gsl_sf_psi.h	2013-03-30 20:12:56 +0000
+++ specfunc/gsl_sf_psi.h	2013-03-30 20:59:11 +0000
@@ -24,17 +24,17 @@
 
 #include <gsl/gsl_sf_result.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 
 /* Poly-Gamma Functions
@@ -108,6 +108,6 @@
 double  gsl_sf_psi_n(const int n, const double x);
 
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_SF_PSI_H */

=== modified file 'specfunc/gsl_sf_result.h'
--- specfunc/gsl_sf_result.h	2013-03-30 20:12:56 +0000
+++ specfunc/gsl_sf_result.h	2013-03-30 20:59:11 +0000
@@ -22,17 +22,17 @@
 #ifndef GSL_SF_RESULT_H
 #define GSL_SF_RESULT_H
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 struct gsl_sf_result_struct {
   double val;
@@ -54,6 +54,6 @@
 int gsl_sf_result_smash_e(const gsl_sf_result_e10 * re, gsl_sf_result * r);
 
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_SF_RESULT_H */

=== modified file 'specfunc/gsl_sf_synchrotron.h'
--- specfunc/gsl_sf_synchrotron.h	2013-03-30 20:12:56 +0000
+++ specfunc/gsl_sf_synchrotron.h	2013-03-30 20:59:11 +0000
@@ -24,17 +24,17 @@
 
 #include <gsl/gsl_sf_result.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 
 /* First synchrotron function:
@@ -55,6 +55,6 @@
 double     gsl_sf_synchrotron_2(const double x);
 
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_SF_SYNCHROTRON_H */

=== modified file 'specfunc/gsl_sf_transport.h'
--- specfunc/gsl_sf_transport.h	2013-03-30 20:12:56 +0000
+++ specfunc/gsl_sf_transport.h	2013-03-30 20:59:11 +0000
@@ -24,17 +24,17 @@
 
 #include <gsl/gsl_sf_result.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 
 /* Transport function:
@@ -73,6 +73,6 @@
 double     gsl_sf_transport_5(const double x);
 
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_SF_TRANSPORT_H */

=== modified file 'specfunc/gsl_sf_trig.h'
--- specfunc/gsl_sf_trig.h	2013-03-30 20:12:56 +0000
+++ specfunc/gsl_sf_trig.h	2013-03-30 20:59:11 +0000
@@ -24,17 +24,17 @@
 
 #include <gsl/gsl_sf_result.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 
 /* Sin(x) with GSL semantics. This is actually important
@@ -147,6 +147,6 @@
 int gsl_sf_angle_restrict_pos_err_e(const double theta, gsl_sf_result * result);
 
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_SF_TRIG_H */

=== modified file 'specfunc/gsl_sf_zeta.h'
--- specfunc/gsl_sf_zeta.h	2013-03-30 20:12:56 +0000
+++ specfunc/gsl_sf_zeta.h	2013-03-30 20:59:11 +0000
@@ -24,17 +24,17 @@
 
 #include <gsl/gsl_sf_result.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 
 /* Riemann Zeta Function
@@ -107,6 +107,6 @@
 double gsl_sf_eta(const double s);
 
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_SF_ZETA_H */

=== modified file 'statistics/gsl_statistics_char.h'
--- statistics/gsl_statistics_char.h	2013-03-30 20:12:56 +0000
+++ statistics/gsl_statistics_char.h	2013-03-30 20:59:11 +0000
@@ -22,17 +22,17 @@
 
 #include <stddef.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 double gsl_stats_char_mean (const char data[], const size_t stride, const size_t n);
 double gsl_stats_char_variance (const char data[], const size_t stride, const size_t n);
@@ -74,6 +74,6 @@
 double gsl_stats_char_median_from_sorted_data (const char sorted_data[], const size_t stride, const size_t n) ;
 double gsl_stats_char_quantile_from_sorted_data (const char sorted_data[], const size_t stride, const size_t n, const double f) ;
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_STATISTICS_CHAR_H */

=== modified file 'statistics/gsl_statistics_double.h'
--- statistics/gsl_statistics_double.h	2013-03-30 20:12:56 +0000
+++ statistics/gsl_statistics_double.h	2013-03-30 20:59:11 +0000
@@ -22,17 +22,17 @@
 
 #include <stddef.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 double gsl_stats_mean (const double data[], const size_t stride, const size_t n);
 double gsl_stats_variance (const double data[], const size_t stride, const size_t n);
@@ -94,6 +94,6 @@
 double gsl_stats_median_from_sorted_data (const double sorted_data[], const size_t stride, const size_t n) ;
 double gsl_stats_quantile_from_sorted_data (const double sorted_data[], const size_t stride, const size_t n, const double f) ;
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_STATISTICS_DOUBLE_H */

=== modified file 'statistics/gsl_statistics_float.h'
--- statistics/gsl_statistics_float.h	2013-03-30 20:12:56 +0000
+++ statistics/gsl_statistics_float.h	2013-03-30 20:59:11 +0000
@@ -22,17 +22,17 @@
 
 #include <stddef.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 double gsl_stats_float_mean (const float data[], const size_t stride, const size_t n);
 double gsl_stats_float_variance (const float data[], const size_t stride, const size_t n);
@@ -94,6 +94,6 @@
 double gsl_stats_float_median_from_sorted_data (const float sorted_data[], const size_t stride, const size_t n) ;
 double gsl_stats_float_quantile_from_sorted_data (const float sorted_data[], const size_t stride, const size_t n, const double f) ;
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_STATISTICS_FLOAT_H */

=== modified file 'statistics/gsl_statistics_int.h'
--- statistics/gsl_statistics_int.h	2013-03-30 20:12:56 +0000
+++ statistics/gsl_statistics_int.h	2013-03-30 20:59:11 +0000
@@ -22,17 +22,17 @@
 
 #include <stddef.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 double gsl_stats_int_mean (const int data[], const size_t stride, const size_t n);
 double gsl_stats_int_variance (const int data[], const size_t stride, const size_t n);
@@ -74,6 +74,6 @@
 double gsl_stats_int_median_from_sorted_data (const int sorted_data[], const size_t stride, const size_t n) ;
 double gsl_stats_int_quantile_from_sorted_data (const int sorted_data[], const size_t stride, const size_t n, const double f) ;
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_STATISTICS_INT_H */

=== modified file 'statistics/gsl_statistics_long.h'
--- statistics/gsl_statistics_long.h	2013-03-30 20:12:56 +0000
+++ statistics/gsl_statistics_long.h	2013-03-30 20:59:11 +0000
@@ -22,17 +22,17 @@
 
 #include <stddef.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 double gsl_stats_long_mean (const long data[], const size_t stride, const size_t n);
 double gsl_stats_long_variance (const long data[], const size_t stride, const size_t n);
@@ -74,6 +74,6 @@
 double gsl_stats_long_median_from_sorted_data (const long sorted_data[], const size_t stride, const size_t n) ;
 double gsl_stats_long_quantile_from_sorted_data (const long sorted_data[], const size_t stride, const size_t n, const double f) ;
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_STATISTICS_LONG_H */

=== modified file 'statistics/gsl_statistics_long_double.h'
--- statistics/gsl_statistics_long_double.h	2013-03-30 20:12:56 +0000
+++ statistics/gsl_statistics_long_double.h	2013-03-30 20:59:11 +0000
@@ -22,17 +22,17 @@
 
 #include <stddef.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 double gsl_stats_long_double_mean (const long double data[], const size_t stride, const size_t n);
 double gsl_stats_long_double_variance (const long double data[], const size_t stride, const size_t n);
@@ -94,6 +94,6 @@
 double gsl_stats_long_double_median_from_sorted_data (const long double sorted_data[], const size_t stride, const size_t n) ;
 double gsl_stats_long_double_quantile_from_sorted_data (const long double sorted_data[], const size_t stride, const size_t n, const double f) ;
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_STATISTICS_LONG_DOUBLE_H */

=== modified file 'statistics/gsl_statistics_short.h'
--- statistics/gsl_statistics_short.h	2013-03-30 20:12:56 +0000
+++ statistics/gsl_statistics_short.h	2013-03-30 20:59:11 +0000
@@ -22,17 +22,17 @@
 
 #include <stddef.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 double gsl_stats_short_mean (const short data[], const size_t stride, const size_t n);
 double gsl_stats_short_variance (const short data[], const size_t stride, const size_t n);
@@ -74,6 +74,6 @@
 double gsl_stats_short_median_from_sorted_data (const short sorted_data[], const size_t stride, const size_t n) ;
 double gsl_stats_short_quantile_from_sorted_data (const short sorted_data[], const size_t stride, const size_t n, const double f) ;
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_STATISTICS_SHORT_H */

=== modified file 'statistics/gsl_statistics_uchar.h'
--- statistics/gsl_statistics_uchar.h	2013-03-30 20:12:56 +0000
+++ statistics/gsl_statistics_uchar.h	2013-03-30 20:59:11 +0000
@@ -22,17 +22,17 @@
 
 #include <stddef.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 double gsl_stats_uchar_mean (const unsigned char data[], const size_t stride, const size_t n);
 double gsl_stats_uchar_variance (const unsigned char data[], const size_t stride, const size_t n);
@@ -74,6 +74,6 @@
 double gsl_stats_uchar_median_from_sorted_data (const unsigned char sorted_data[], const size_t stride, const size_t n) ;
 double gsl_stats_uchar_quantile_from_sorted_data (const unsigned char sorted_data[], const size_t stride, const size_t n, const double f) ;
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_STATISTICS_UCHAR_H */

=== modified file 'statistics/gsl_statistics_uint.h'
--- statistics/gsl_statistics_uint.h	2013-03-30 20:12:56 +0000
+++ statistics/gsl_statistics_uint.h	2013-03-30 20:59:11 +0000
@@ -22,17 +22,17 @@
 
 #include <stddef.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 double gsl_stats_uint_mean (const unsigned int data[], const size_t stride, const size_t n);
 double gsl_stats_uint_variance (const unsigned int data[], const size_t stride, const size_t n);
@@ -74,6 +74,6 @@
 double gsl_stats_uint_median_from_sorted_data (const unsigned int sorted_data[], const size_t stride, const size_t n) ;
 double gsl_stats_uint_quantile_from_sorted_data (const unsigned int sorted_data[], const size_t stride, const size_t n, const double f) ;
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_STATISTICS_UINT_H */

=== modified file 'statistics/gsl_statistics_ulong.h'
--- statistics/gsl_statistics_ulong.h	2013-03-30 20:12:56 +0000
+++ statistics/gsl_statistics_ulong.h	2013-03-30 20:59:11 +0000
@@ -22,17 +22,17 @@
 
 #include <stddef.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 double gsl_stats_ulong_mean (const unsigned long data[], const size_t stride, const size_t n);
 double gsl_stats_ulong_variance (const unsigned long data[], const size_t stride, const size_t n);
@@ -74,6 +74,6 @@
 double gsl_stats_ulong_median_from_sorted_data (const unsigned long sorted_data[], const size_t stride, const size_t n) ;
 double gsl_stats_ulong_quantile_from_sorted_data (const unsigned long sorted_data[], const size_t stride, const size_t n, const double f) ;
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_STATISTICS_ULONG_H */

=== modified file 'statistics/gsl_statistics_ushort.h'
--- statistics/gsl_statistics_ushort.h	2013-03-30 20:12:56 +0000
+++ statistics/gsl_statistics_ushort.h	2013-03-30 20:59:11 +0000
@@ -22,17 +22,17 @@
 
 #include <stddef.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 double gsl_stats_ushort_mean (const unsigned short data[], const size_t stride, const size_t n);
 double gsl_stats_ushort_variance (const unsigned short data[], const size_t stride, const size_t n);
@@ -74,6 +74,6 @@
 double gsl_stats_ushort_median_from_sorted_data (const unsigned short sorted_data[], const size_t stride, const size_t n) ;
 double gsl_stats_ushort_quantile_from_sorted_data (const unsigned short sorted_data[], const size_t stride, const size_t n, const double f) ;
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_STATISTICS_USHORT_H */

=== modified file 'sum/gsl_sum.h'
--- sum/gsl_sum.h	2013-03-30 20:12:56 +0000
+++ sum/gsl_sum.h	2013-03-30 20:59:11 +0000
@@ -25,17 +25,17 @@
 
 #include <stdlib.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS          /* empty */
-# define __END_DECLS            /* empty */
+# define GSL_BEGIN_DECLS          /* empty */
+# define GSL_END_DECLS            /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 /*  Workspace for Levin U Transform with error estimation,
  *   
@@ -157,6 +157,6 @@
                                gsl_sum_levin_utrunc_workspace * w, 
                                double *sum_accel);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_SUM_H */

=== modified file 'sys/gsl_sys.h'
--- sys/gsl_sys.h	2013-03-30 20:12:56 +0000
+++ sys/gsl_sys.h	2013-03-30 20:59:11 +0000
@@ -20,17 +20,17 @@
 #ifndef GSL_SYS_H
 #define GSL_SYS_H
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 double gsl_log1p (const double x);
 double gsl_expm1 (const double x);
@@ -58,6 +58,6 @@
 
 int gsl_fcmp (const double x1, const double x2, const double epsilon);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_SYS_H */

=== modified file 'test/gsl_test.h'
--- test/gsl_test.h	2013-03-30 20:12:56 +0000
+++ test/gsl_test.h	2013-03-30 20:59:11 +0000
@@ -20,17 +20,17 @@
 #ifndef GSL_TEST_H
 #define GSL_TEST_H
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 void
   gsl_test (int status, const char *test_description, ...);
@@ -61,6 +61,6 @@
   gsl_test_summary (void) ;
 
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_TEST_H */

=== modified file 'vector/gsl_vector_char.h'
--- vector/gsl_vector_char.h	2013-03-30 20:12:56 +0000
+++ vector/gsl_vector_char.h	2013-03-30 20:59:11 +0000
@@ -27,17 +27,17 @@
 #include <gsl/gsl_check_range.h>
 #include <gsl/gsl_block_char.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 typedef struct 
 {
@@ -223,7 +223,7 @@
 }
 #endif /* HAVE_INLINE */
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_VECTOR_CHAR_H */
 

=== modified file 'vector/gsl_vector_complex_double.h'
--- vector/gsl_vector_complex_double.h	2013-03-30 20:12:56 +0000
+++ vector/gsl_vector_complex_double.h	2013-03-30 20:59:11 +0000
@@ -29,17 +29,17 @@
 #include <gsl/gsl_vector_complex.h>
 #include <gsl/gsl_block_complex_double.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 typedef struct 
 {
@@ -246,6 +246,6 @@
 
 #endif /* HAVE_INLINE */
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_VECTOR_COMPLEX_DOUBLE_H */

=== modified file 'vector/gsl_vector_complex_float.h'
--- vector/gsl_vector_complex_float.h	2013-03-30 20:12:56 +0000
+++ vector/gsl_vector_complex_float.h	2013-03-30 20:59:11 +0000
@@ -29,17 +29,17 @@
 #include <gsl/gsl_vector_complex.h>
 #include <gsl/gsl_block_complex_float.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 typedef struct 
 {
@@ -246,6 +246,6 @@
 
 #endif /* HAVE_INLINE */
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_VECTOR_COMPLEX_FLOAT_H */

=== modified file 'vector/gsl_vector_complex_long_double.h'
--- vector/gsl_vector_complex_long_double.h	2013-03-30 20:12:56 +0000
+++ vector/gsl_vector_complex_long_double.h	2013-03-30 20:59:11 +0000
@@ -29,17 +29,17 @@
 #include <gsl/gsl_vector_complex.h>
 #include <gsl/gsl_block_complex_long_double.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 typedef struct 
 {
@@ -246,6 +246,6 @@
 
 #endif /* HAVE_INLINE */
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_VECTOR_COMPLEX_LONG_DOUBLE_H */

=== modified file 'vector/gsl_vector_double.h'
--- vector/gsl_vector_double.h	2013-03-30 20:12:56 +0000
+++ vector/gsl_vector_double.h	2013-03-30 20:59:11 +0000
@@ -27,17 +27,17 @@
 #include <gsl/gsl_check_range.h>
 #include <gsl/gsl_block_double.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 typedef struct 
 {
@@ -223,7 +223,7 @@
 }
 #endif /* HAVE_INLINE */
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_VECTOR_DOUBLE_H */
 

=== modified file 'vector/gsl_vector_float.h'
--- vector/gsl_vector_float.h	2013-03-30 20:12:56 +0000
+++ vector/gsl_vector_float.h	2013-03-30 20:59:11 +0000
@@ -27,17 +27,17 @@
 #include <gsl/gsl_check_range.h>
 #include <gsl/gsl_block_float.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 typedef struct 
 {
@@ -223,7 +223,7 @@
 }
 #endif /* HAVE_INLINE */
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_VECTOR_FLOAT_H */
 

=== modified file 'vector/gsl_vector_int.h'
--- vector/gsl_vector_int.h	2013-03-30 20:12:56 +0000
+++ vector/gsl_vector_int.h	2013-03-30 20:59:11 +0000
@@ -27,17 +27,17 @@
 #include <gsl/gsl_check_range.h>
 #include <gsl/gsl_block_int.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 typedef struct 
 {
@@ -223,7 +223,7 @@
 }
 #endif /* HAVE_INLINE */
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_VECTOR_INT_H */
 

=== modified file 'vector/gsl_vector_long.h'
--- vector/gsl_vector_long.h	2013-03-30 20:12:56 +0000
+++ vector/gsl_vector_long.h	2013-03-30 20:59:11 +0000
@@ -27,17 +27,17 @@
 #include <gsl/gsl_check_range.h>
 #include <gsl/gsl_block_long.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 typedef struct 
 {
@@ -223,7 +223,7 @@
 }
 #endif /* HAVE_INLINE */
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_VECTOR_LONG_H */
 

=== modified file 'vector/gsl_vector_long_double.h'
--- vector/gsl_vector_long_double.h	2013-03-30 20:12:56 +0000
+++ vector/gsl_vector_long_double.h	2013-03-30 20:59:11 +0000
@@ -27,17 +27,17 @@
 #include <gsl/gsl_check_range.h>
 #include <gsl/gsl_block_long_double.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 typedef struct 
 {
@@ -223,7 +223,7 @@
 }
 #endif /* HAVE_INLINE */
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_VECTOR_LONG_DOUBLE_H */
 

=== modified file 'vector/gsl_vector_short.h'
--- vector/gsl_vector_short.h	2013-03-30 20:12:56 +0000
+++ vector/gsl_vector_short.h	2013-03-30 20:59:11 +0000
@@ -27,17 +27,17 @@
 #include <gsl/gsl_check_range.h>
 #include <gsl/gsl_block_short.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 typedef struct 
 {
@@ -223,7 +223,7 @@
 }
 #endif /* HAVE_INLINE */
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_VECTOR_SHORT_H */
 

=== modified file 'vector/gsl_vector_uchar.h'
--- vector/gsl_vector_uchar.h	2013-03-30 20:12:56 +0000
+++ vector/gsl_vector_uchar.h	2013-03-30 20:59:11 +0000
@@ -27,17 +27,17 @@
 #include <gsl/gsl_check_range.h>
 #include <gsl/gsl_block_uchar.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 typedef struct 
 {
@@ -223,7 +223,7 @@
 }
 #endif /* HAVE_INLINE */
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_VECTOR_UCHAR_H */
 

=== modified file 'vector/gsl_vector_uint.h'
--- vector/gsl_vector_uint.h	2013-03-30 20:12:56 +0000
+++ vector/gsl_vector_uint.h	2013-03-30 20:59:11 +0000
@@ -27,17 +27,17 @@
 #include <gsl/gsl_check_range.h>
 #include <gsl/gsl_block_uint.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 typedef struct 
 {
@@ -223,7 +223,7 @@
 }
 #endif /* HAVE_INLINE */
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_VECTOR_UINT_H */
 

=== modified file 'vector/gsl_vector_ulong.h'
--- vector/gsl_vector_ulong.h	2013-03-30 20:12:56 +0000
+++ vector/gsl_vector_ulong.h	2013-03-30 20:59:11 +0000
@@ -27,17 +27,17 @@
 #include <gsl/gsl_check_range.h>
 #include <gsl/gsl_block_ulong.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 typedef struct 
 {
@@ -223,7 +223,7 @@
 }
 #endif /* HAVE_INLINE */
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_VECTOR_ULONG_H */
 

=== modified file 'vector/gsl_vector_ushort.h'
--- vector/gsl_vector_ushort.h	2013-03-30 20:12:56 +0000
+++ vector/gsl_vector_ushort.h	2013-03-30 20:59:11 +0000
@@ -27,17 +27,17 @@
 #include <gsl/gsl_check_range.h>
 #include <gsl/gsl_block_ushort.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+# define GSL_BEGIN_DECLS /* empty */
+# define GSL_END_DECLS /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 typedef struct 
 {
@@ -223,7 +223,7 @@
 }
 #endif /* HAVE_INLINE */
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_VECTOR_USHORT_H */
 

=== modified file 'wavelet/gsl_wavelet.h'
--- wavelet/gsl_wavelet.h	2013-03-30 20:12:56 +0000
+++ wavelet/gsl_wavelet.h	2013-03-30 20:59:11 +0000
@@ -23,17 +23,17 @@
 #include <gsl/gsl_types.h>
 #include <gsl/gsl_errno.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS          /* empty */
-# define __END_DECLS            /* empty */
+# define GSL_BEGIN_DECLS          /* empty */
+# define GSL_END_DECLS            /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 #ifndef GSL_DISABLE_DEPRECATED
 typedef enum {
@@ -103,6 +103,6 @@
                                     double *data, size_t stride, size_t n, 
                                     gsl_wavelet_workspace * work);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_WAVELET_H */

=== modified file 'wavelet/gsl_wavelet2d.h'
--- wavelet/gsl_wavelet2d.h	2013-03-30 20:12:56 +0000
+++ wavelet/gsl_wavelet2d.h	2013-03-30 20:59:11 +0000
@@ -25,17 +25,17 @@
 #include <gsl/gsl_matrix_double.h>
 #include <gsl/gsl_wavelet.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+#undef GSL_BEGIN_DECLS
+#undef GSL_END_DECLS
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
+# define GSL_BEGIN_DECLS extern "C" {
+# define GSL_END_DECLS }
 #else
-# define __BEGIN_DECLS          /* empty */
-# define __END_DECLS            /* empty */
+# define GSL_BEGIN_DECLS          /* empty */
+# define GSL_END_DECLS            /* empty */
 #endif
 
-__BEGIN_DECLS
+GSL_BEGIN_DECLS
 
 int gsl_wavelet2d_transform (const gsl_wavelet * w, 
                              double *data, 
@@ -102,6 +102,6 @@
                                           gsl_matrix * a, 
                                           gsl_wavelet_workspace * work);
 
-__END_DECLS
+GSL_END_DECLS
 
 #endif /* GSL_WAVELET2D_H */

