GNOME.org
 

[beast: 1/15] SFI: remove 'extern "C"' from all API

commit a24b57b0a4fd9fd7dfacd216a6e1ce9f89ba1532
Author: Tim Janik <timj gnu org>
Date:   Wed Oct 26 22:29:33 2016 +0200

    SFI: remove 'extern "C"' from all API
    
    Signed-off-by: Tim Janik <timj gnu org>

 sfi/glib-extra.hh     |    4 ----
 sfi/sficomport.hh     |    4 ----
 sfi/sficomwire.hh     |    8 --------
 sfi/sfifilecrawler.hh |    4 ----
 sfi/sfiglue.hh        |    4 ----
 sfi/sfigluecodec.hh   |    8 --------
 sfi/sfiglueproxy.hh   |    4 ----
 sfi/sfimemory.hh      |    3 ---
 sfi/sfinote.hh        |    4 ----
 sfi/sfiparams.hh      |    4 ----
 sfi/sfiprimitives.hh  |    4 ----
 sfi/sfiring.hh        |    4 ----
 sfi/sfiserial.hh      |    4 ----
 sfi/sfistore.hh       |    4 ----
 sfi/sfitime.hh        |    4 ----
 sfi/sfitypes.hh       |    4 ----
 sfi/sfiustore.hh      |    4 ----
 sfi/sfivalues.hh      |    4 ----
 sfi/sfivmarshal.hh    |    4 ----
 sfi/sfiwrapper.hh     |    4 ----
 20 files changed, 0 insertions(+), 87 deletions(-)
---
diff --git a/sfi/glib-extra.hh b/sfi/glib-extra.hh
index c32b777..5f5112f 100644
--- a/sfi/glib-extra.hh
+++ b/sfi/glib-extra.hh
@@ -10,8 +10,6 @@ using Rapicorn::printout;
 using Rapicorn::printerr;
 using Rapicorn::string_format;
 
-G_BEGIN_DECLS
-
 #if (GLIB_SIZEOF_LONG > 4)
 #define G_HASH_LONG(l) ((l) + ((l) >> 32))
 #else
@@ -303,8 +301,6 @@ GScanner*   g_scanner_new64                 (const GScannerConfig *config_templ);
 #define g_scanner_thaw_symbol_table(scanner) ((void)0)
 #endif /* G_DISABLE_DEPRECATED */
 
-G_END_DECLS
-
 // == Flags Enumeration Operators in C++ ==
 #ifdef __cplusplus
 constexpr GParamFlags  operator&  (GParamFlags  s1, GParamFlags s2) { return GParamFlags (s1 & (long long 
unsigned) s2); }
diff --git a/sfi/sficomport.hh b/sfi/sficomport.hh
index ffb5671..ffb07cc 100644
--- a/sfi/sficomport.hh
+++ b/sfi/sficomport.hh
@@ -5,8 +5,6 @@
 #include <sfi/sfitypes.hh>
 #include <sfi/sfiring.hh>
 
-G_BEGIN_DECLS
-
 #define        SFI_COM_PORT_MAGIC      (0x42534500 /* "BSE\0" */)
 
 struct SfiComPort;
@@ -103,6 +101,4 @@ void                sfi_com_port_reap_child         (SfiComPort     *port,
                                                 gboolean        kill_child);
 gboolean       sfi_com_port_test_reap_child    (SfiComPort     *port);
 
-G_END_DECLS
-
 #endif /* __SFI_COM_PORT_H__ */
diff --git a/sfi/sficomwire.hh b/sfi/sficomwire.hh
index 8438d09..792795e 100644
--- a/sfi/sficomwire.hh
+++ b/sfi/sficomwire.hh
@@ -5,10 +5,6 @@
 #include <sfi/sfitypes.hh>
 #include <sfi/sfiring.hh>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
 
 typedef struct _SfiComWire SfiComWire;
 typedef gboolean (*SfiComDispatch)     (gpointer        data,
@@ -160,8 +156,4 @@ const char* sfi_com_spawn_async             (const gchar    *executable,
                                                 SfiRing        *args);
 
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
 #endif /* __SFI_COM_WIRE_H__ */
diff --git a/sfi/sfifilecrawler.hh b/sfi/sfifilecrawler.hh
index 588eacc..a703ebd 100644
--- a/sfi/sfifilecrawler.hh
+++ b/sfi/sfifilecrawler.hh
@@ -5,8 +5,6 @@
 #include <sfi/sfitypes.hh>
 #include <sfi/sfiring.hh>
 
-G_BEGIN_DECLS
-
 typedef struct {
   SfiRing      *results;        /* end user results */
   /*< private >*/
@@ -55,8 +53,6 @@ gboolean        g_file_test_all                         (const gchar  *filename,
 /* --- implementations --- */
 void _sfi_init_file_crawler (void);
 
-G_END_DECLS
-
 #endif /* __SFI_FILE_CRAWLER_H__ */
 
 /* vim:set ts=8 sts=2 sw=2: */
diff --git a/sfi/sfiglue.hh b/sfi/sfiglue.hh
index 35785d7..2d4ad44 100644
--- a/sfi/sfiglue.hh
+++ b/sfi/sfiglue.hh
@@ -6,8 +6,6 @@
 #include <sfi/sfiring.hh>
 #include <sfi/sfiparams.hh>
 
-G_BEGIN_DECLS
-
 /* Glue proxy (object handle) description in terms of
  * supported interfaces and property names
  */
@@ -217,8 +215,6 @@ sfi_glue_fetch_context (const gchar *floc)
   return context;
 }
 
-G_END_DECLS
-
 #endif /* __SFI_GLUE_H__ */
 
 /* vim:set ts=8 sts=2 sw=2: */
diff --git a/sfi/sfigluecodec.hh b/sfi/sfigluecodec.hh
index a0baf2f..81656f6 100644
--- a/sfi/sfigluecodec.hh
+++ b/sfi/sfigluecodec.hh
@@ -5,10 +5,6 @@
 #include <sfi/sfiglue.hh>
 #include <sfi/sficomport.hh>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
 
 /* --- encoder API --- */
 typedef struct
@@ -82,10 +78,6 @@ typedef enum /*< skip >*/
 
 
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
 #endif /* __SFI_GLUE_CODEC_H__ */
 
 /* vim:set ts=8 sts=2 sw=2: */
diff --git a/sfi/sfiglueproxy.hh b/sfi/sfiglueproxy.hh
index d23ec05..322019e 100644
--- a/sfi/sfiglueproxy.hh
+++ b/sfi/sfiglueproxy.hh
@@ -4,8 +4,6 @@
 
 #include <sfi/sfiglue.hh>
 
-G_BEGIN_DECLS
-
 
 /* --- typedefs --- */
 typedef enum /*< skip >*/
@@ -92,8 +90,6 @@ void      sfi_glue_proxy_cancel_matched_event (SfiSeq         *event,
                                                 GQuark          signal_quark);
 
 
-G_END_DECLS
-
 #endif /* __SFI_GLUE_PROXY_H__ */
 
 /* vim:set ts=8 sts=2 sw=2: */
diff --git a/sfi/sfimemory.hh b/sfi/sfimemory.hh
index 383e155..593fc92 100644
--- a/sfi/sfimemory.hh
+++ b/sfi/sfimemory.hh
@@ -4,8 +4,6 @@
 
 #include <sfi/sfitypes.hh>
 
-G_BEGIN_DECLS
-
 
 /* --- macros --- */
 #define sfi_new_struct(type, n)                ((type*) sfi_alloc_memblock (sizeof (type) * (n)))
@@ -33,6 +31,5 @@ void            sfi_alloc_report        (void);
 gulong         sfi_alloc_upper_power2  (const gulong    number);
 void           _sfi_free_node_list     (gpointer        mem,
                                         gsize           node_size);
-G_END_DECLS
 #endif /* __SFI_MEMORY_H__ */
 /* vim:set ts=8 sts=2 sw=2: */
diff --git a/sfi/sfinote.hh b/sfi/sfinote.hh
index 761bfe2..9e822c8 100644
--- a/sfi/sfinote.hh
+++ b/sfi/sfinote.hh
@@ -4,8 +4,6 @@
 
 #include <sfi/sfitypes.hh>
 
-G_BEGIN_DECLS
-
 
 /* --- (MIDI) notes --- */
 /* notes are generally kept in signed integers. though they are zero
@@ -79,8 +77,6 @@ SfiInt        sfi_note_from_string_err (const gchar   *note_string,
                                  gchar        **error_p);
 
 
-G_END_DECLS
-
 #endif /* __SFI_NOTE_H__ */
 
 /* vim:set ts=8 sts=2 sw=2: */
diff --git a/sfi/sfiparams.hh b/sfi/sfiparams.hh
index 896acc5..fbc1db8 100644
--- a/sfi/sfiparams.hh
+++ b/sfi/sfiparams.hh
@@ -5,8 +5,6 @@
 #include <sfi/sfivalues.hh>
 #include <sfi/sfiprimitives.hh>
 
-G_BEGIN_DECLS
-
 
 /* --- Sfi param spec macros --- */
 #define SFI_TYPE_PARAM_BOOL            (G_TYPE_PARAM_BOOLEAN)
@@ -317,8 +315,6 @@ extern GType*        sfi__param_spec_types;
 SfiRec*                sfi_pspec_to_rec        (GParamSpec     *pspec);
 GParamSpec*    sfi_pspec_from_rec      (SfiRec         *prec);
 
-G_END_DECLS
-
 namespace Bse { // bsecore
 
 SfiChoiceValues choice_values_from_enum_values (const String &enumname, const 
::Rapicorn::Aida::EnumValueVector &evvec);
diff --git a/sfi/sfiprimitives.hh b/sfi/sfiprimitives.hh
index aca6747..bf425a4 100644
--- a/sfi/sfiprimitives.hh
+++ b/sfi/sfiprimitives.hh
@@ -4,8 +4,6 @@
 
 #include <sfi/sfivalues.hh>
 
-G_BEGIN_DECLS
-
 
 /* --- SfiBBlock primitive type --- */
 struct _SfiBBlock {
@@ -229,8 +227,6 @@ SfiRec*          sfi_rec_get_rec    (SfiRec         *rec,
 SfiProxy     sfi_rec_get_proxy (SfiRec         *rec,
                                 const gchar    *field_name);
 
-G_END_DECLS
-
 #endif /* __SFI_PRIMITIVES_H__ */
 
 /* vim:set ts=8 sts=2 sw=2: */
diff --git a/sfi/sfiring.hh b/sfi/sfiring.hh
index 90a424a..3496d9a 100644
--- a/sfi/sfiring.hh
+++ b/sfi/sfiring.hh
@@ -4,8 +4,6 @@
 
 #include <sfi/sfitypes.hh>
 
-G_BEGIN_DECLS;
-
 
 /* --- basic comparisons --- */
 typedef gint (*SfiCompareFunc)         (gconstpointer   value1,
@@ -157,8 +155,6 @@ gpointer    sfi_ring_max            (const SfiRing          *head,
                                          SfiCompareFunc         cmp,
                                          gpointer               data);
 
-G_END_DECLS;
-
 #endif /* __SFI_RING_H__ */
 
 /* vim:set ts=8 sts=2 sw=2: */
diff --git a/sfi/sfiserial.hh b/sfi/sfiserial.hh
index 1bd905c..9727c6c 100644
--- a/sfi/sfiserial.hh
+++ b/sfi/sfiserial.hh
@@ -4,8 +4,6 @@
 
 #include <sfi/sfivalues.hh>
 
-G_BEGIN_DECLS
-
 
 /* --- functions --- */
 GTokenType     sfi_value_parse_typed           (GValue         *value,
@@ -34,8 +32,6 @@ gboolean sfi_serial_check_parse_null_token    (GScanner       *scanner);
 extern const GScannerConfig *sfi_storage_scanner_config;
 
 
-G_END_DECLS
-
 #endif /* __SFI_SERIAL_H__ */
 
 /* vim:set ts=8 sts=2 sw=2: */
diff --git a/sfi/sfistore.hh b/sfi/sfistore.hh
index 4d94766..2dc9cc6 100644
--- a/sfi/sfistore.hh
+++ b/sfi/sfistore.hh
@@ -5,8 +5,6 @@
 #include <sfi/sfivalues.hh>
 #include <sfi/sfiring.hh>
 
-G_BEGIN_DECLS
-
 /* --- typedefs and structures --- */
 typedef gint /* -errno || length */ (*SfiStoreReadBin)  (gpointer        data,
                                                          void           *buffer,
@@ -127,6 +125,4 @@ void            sfi_rstore_quick_scan         (SfiRStore      *rstore,
     }                                                                   \
 } G_STMT_END
 
-G_END_DECLS
-
 #endif /* __SFI_STORE_H__ */
diff --git a/sfi/sfitime.hh b/sfi/sfitime.hh
index b6f31a4..a187e89 100644
--- a/sfi/sfitime.hh
+++ b/sfi/sfitime.hh
@@ -4,8 +4,6 @@
 
 #include <sfi/sfivalues.hh>
 
-G_BEGIN_DECLS
-
 /* --- time (unix micro seconds) --- */
 #define        SFI_USEC_FACTOR         ((SfiTime) 1000000)             /* 64bit wide */
 #define        SFI_MIN_TIME            (631152000 * SFI_USEC_FACTOR)   /* 1990-01-01 00:00:00 UTC */
@@ -28,8 +26,6 @@ SfiTime       sfi_time_from_string_err (const gchar   *time_string,
 void   _sfi_init_time  (void);
 
 
-G_END_DECLS
-
 #endif /* __SFI_TIME_H__ */
 
 /* vim:set ts=8 sts=2 sw=2: */
diff --git a/sfi/sfitypes.hh b/sfi/sfitypes.hh
index 5d50ea0..923cf30 100644
--- a/sfi/sfitypes.hh
+++ b/sfi/sfitypes.hh
@@ -5,8 +5,6 @@
 #include <sfi/glib-extra.hh>
 #include <sfi/sfiwrapper.hh>
 
-G_BEGIN_DECLS
-
 /* --- Sfi typedefs --- */
 typedef bool                   SfiBool;
 typedef gint                   SfiInt;
@@ -70,8 +68,6 @@ const char*  sfi_category_concat        (const char         *prefix,
 #define SFI_END_ARGS3(a,b,c) a , b , c)
 
 
-G_END_DECLS
-
 #endif /* __SFI_TYPES_H__ */
 
 /* vim:set ts=8 sts=2 sw=2: */
diff --git a/sfi/sfiustore.hh b/sfi/sfiustore.hh
index 1aabe4d..7ee1c7f 100644
--- a/sfi/sfiustore.hh
+++ b/sfi/sfiustore.hh
@@ -4,8 +4,6 @@
 
 #include <sfi/sfitypes.hh>
 
-G_BEGIN_DECLS
-
 
 /* --- typedefs --- */
 /* typedef struct _SfiUStore SfiUStore; */
@@ -66,8 +64,6 @@ void          sfi_ppool_destroy       (SfiPPool        *pool);
 
 
 
-G_END_DECLS
-
 #endif /* __SFI_USTORE_H__ */
 
 /* vim:set ts=8 sts=2 sw=2: */
diff --git a/sfi/sfivalues.hh b/sfi/sfivalues.hh
index 3764293..789a15a 100644
--- a/sfi/sfivalues.hh
+++ b/sfi/sfivalues.hh
@@ -4,8 +4,6 @@
 
 #include <sfi/sfitypes.hh>
 
-G_BEGIN_DECLS
-
 
 /* --- Sfi value type aliases --- */
 #define        SFI_TYPE_BOOL           G_TYPE_BOOLEAN
@@ -172,8 +170,6 @@ void             _sfi_init_values   (void);
 extern GType *sfi__value_types;
 gboolean      sfi_check_value  (const GValue   *value);
 
-G_END_DECLS
-
 #endif /* __SFI_VALUES_H__ */
 
 /* vim:set ts=8 sts=2 sw=2: */
diff --git a/sfi/sfivmarshal.hh b/sfi/sfivmarshal.hh
index 6958684..7b2d1ec 100644
--- a/sfi/sfivmarshal.hh
+++ b/sfi/sfivmarshal.hh
@@ -4,8 +4,6 @@
 
 #include <sfi/sfitypes.hh>
 
-G_BEGIN_DECLS
-
 /* --- hard limit --- */
 #define        SFI_VMARSHAL_MAX_ARGS   5
 
@@ -25,8 +23,6 @@ void  sfi_vmarshal_void       (void         *func,
 #define SFI_VMARSHAL_PTR_ID  2
 #endif
 
-G_END_DECLS
-
 #endif /* __SFI_VMARSHAL_H__ */
 
 /* vim:set ts=8 sts=2 sw=2: */
diff --git a/sfi/sfiwrapper.hh b/sfi/sfiwrapper.hh
index b149b56..8947a1d 100644
--- a/sfi/sfiwrapper.hh
+++ b/sfi/sfiwrapper.hh
@@ -39,8 +39,6 @@ using Rapicorn::int32;
 using Rapicorn::int64;
 using Rapicorn::unichar;
 
-extern "C" {
-
 /* --- initialization --- */
 typedef struct
 {
@@ -59,7 +57,5 @@ void sfi_init (int *argcp, char **argv, const Bse::StringVector &args = Bse::Str
 /* --- url handling --- */
 void sfi_url_show                      (const char           *url);
 
-} // "C"
-
 #endif /* __SFI_WRAPPER_H__ */
 /* vim:set ts=8 sts=2 sw=2: */
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]