[hipl-commit] [trunk] Rev 4396: Remove 'extern "C"' declarations for C++.

  • From: Diego Biurrun <diego@xxxxxxxxxx>
  • To: hipl-commit@xxxxxxxxxxxxx
  • Date: Wed, 21 Apr 2010 20:31:46 +0300

Committer: Diego Biurrun <diego@xxxxxxxxxx>
Date: 21/04/2010 at 20:31:46
Revision: 4396
Revision-id: diego@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
Branch nick: trunk

Log:
  Remove 'extern "C"' declarations for C++.
  
  HIPL is a C project.  Such declarations belong in the C++ code using HIPL.
  Besides, only a select few headers were carrying the declarations.

Modified:
  M  agent/connhipd.h
  M  agent/gui_interface.h
  M  agent/hitdb.h
  M  agent/tools.h
  M  i3/aeshash/aes.h

=== modified file 'agent/connhipd.h'
--- agent/connhipd.h    2010-02-17 17:38:08 +0000
+++ agent/connhipd.h    2010-04-21 17:30:23 +0000
@@ -8,20 +8,9 @@
 #ifndef HIP_AGENT_CONNHIPD_H
 #define HIP_AGENT_CONNHIPD_H
 
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* FUNCTION DEFINITIONS */
 int connhipd_init_sock(void);
 int connhipd_run_thread(void);
 void connhipd_quit(void);
 
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
 #endif /*HIP_AGENT_CONNHIPD_H */

=== modified file 'agent/gui_interface.h'
--- agent/gui_interface.h       2010-02-17 17:38:08 +0000
+++ agent/gui_interface.h       2010-04-21 17:30:23 +0000
@@ -10,17 +10,7 @@
 
 #include "hitdb.h"
 
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* FUNCTION DEFINITIONS */
 int check_hit(HIT_Remote *, int);
 
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* HIP_AGENT_GUI_INTERFACE_H */

=== modified file 'agent/hitdb.h'
--- agent/hitdb.h       2010-03-19 09:00:54 +0000
+++ agent/hitdb.h       2010-04-21 17:30:23 +0000
@@ -99,11 +99,6 @@
     void *     next;
 } HIT_Remote;
 
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 int hit_db_init(char *);
 void hit_db_quit(void);
 
@@ -122,9 +117,4 @@
 
 int hit_db_count_locals(void);
 
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* HIP_AGENT_HITDB_H */

=== modified file 'agent/tools.h'
--- agent/tools.h       2010-02-17 17:38:08 +0000
+++ agent/tools.h       2010-04-21 17:30:23 +0000
@@ -9,11 +9,6 @@
 
 #include <netinet/in.h>
 
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 void agent_exit(void);
 
 void print_hit_to_buffer(char *, struct in6_addr *);
@@ -21,9 +16,4 @@
 
 int config_read(const char *);
 
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-
 #endif

=== modified file 'i3/aeshash/aes.h'
--- i3/aeshash/aes.h    2010-02-17 17:38:08 +0000
+++ i3/aeshash/aes.h    2010-04-21 17:30:23 +0000
@@ -68,11 +68,6 @@
 #define KS_LENGTH   4 * BLOCK_SIZE
 #endif
 
-#if defined(__cplusplus)
-extern "C"
-{
-#endif
-
 typedef unsigned int aes_fret;   /* type for function return value       */
 #define aes_bad      0           /* bad function return value            */
 #define aes_good     1           /* good function return value           */
@@ -103,8 +98,4 @@
 void aeshash_r(const unsigned char in[], unsigned char out[]);
 void aeshash_init(void);
 
-#if defined(__cplusplus)
-}
-#endif
-
 #endif

Other related posts:

  • » [hipl-commit] [trunk] Rev 4396: Remove 'extern "C"' declarations for C++. - Diego Biurrun