Ditch useless C++ compatibility goo

diff --git a/actions.h b/actions.h
index 4e91cc4..be9f02c 100644 (file)
--- a/actions.h
+++ b/actions.h
@@ -1,6 +1,6 @@
 #ifndef ACTIONS_H_INCLUDED
 #define ACTIONS_H_INCLUDED
-#define ACTIONS_H_VERSION "$Id: actions.h,v 1.20 2011/09/04 11:10:56 fabiankeil Exp $"
+#define ACTIONS_H_VERSION "$Id: actions.h,v 1.21 2012/07/27 17:39:57 fabiankeil Exp $"
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/actions.h,v $
@@ -36,11 +36,6 @@
  *********************************************************************/
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
 struct action_spec;
 struct current_action_spec;
 struct client_state;
@@ -95,10 +90,6 @@ void unload_current_actions_file(void);
 extern const char actions_rcs[];
 extern const char actions_h_rcs[];
 
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
 #endif /* ndef ACTIONS_H_INCLUDED */
 
 /*

diff --git a/cgi.h b/cgi.h
index 09e0347..be1dbf7 100644 (file)
--- a/cgi.h
+++ b/cgi.h
@@ -1,6 +1,6 @@
 #ifndef CGI_H_INCLUDED
 #define CGI_H_INCLUDED
-#define CGI_H_VERSION "$Id: cgi.h,v 1.41 2011/09/04 11:10:56 fabiankeil Exp $"
+#define CGI_H_VERSION "$Id: cgi.h,v 1.42 2012/11/09 10:47:42 fabiankeil Exp $"
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/cgi.h,v $
@@ -41,10 +41,6 @@
 
 #include "project.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /*
  * Main dispatch function
  */
@@ -130,10 +126,6 @@ extern const size_t  image_blank_length;
 extern const char cgi_rcs[];
 extern const char cgi_h_rcs[];
 
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
 #endif /* ndef CGI_H_INCLUDED */
 
 /*

diff --git a/cgiedit.h b/cgiedit.h
index 287bd47..90017ec 100644 (file)
--- a/cgiedit.h
+++ b/cgiedit.h
@@ -1,6 +1,6 @@
 #ifndef CGIEDIT_H_INCLUDED
 #define CGIEDIT_H_INCLUDED
-#define CGIEDIT_H_VERSION "$Id: cgiedit.h,v 1.11 2009/05/16 13:27:20 fabiankeil Exp $"
+#define CGIEDIT_H_VERSION "$Id: cgiedit.h,v 1.12 2011/09/04 11:10:56 fabiankeil Exp $"
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/cgiedit.h,v $
@@ -40,10 +40,6 @@
 
 #include "project.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /*
  * CGI functions
  */
@@ -98,10 +94,6 @@ extern jb_err cgi_toggle(struct client_state *csp,
 extern const char cgiedit_rcs[];
 extern const char cgiedit_h_rcs[];
 
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
 #endif /* ndef CGI_H_INCLUDED */
 
 /*

diff --git a/cgisimple.h b/cgisimple.h
index f51d347..55cafb6 100644 (file)
--- a/cgisimple.h
+++ b/cgisimple.h
@@ -1,6 +1,6 @@
 #ifndef CGISIMPLE_H_INCLUDED
 #define CGISIMPLE_H_INCLUDED
-#define CGISIMPLE_H_VERSION "$Id: cgisimple.h,v 1.17 2009/05/16 13:27:20 fabiankeil Exp $"
+#define CGISIMPLE_H_VERSION "$Id: cgisimple.h,v 1.18 2011/09/04 11:10:56 fabiankeil Exp $"
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/cgisimple.h,v $
@@ -41,10 +41,6 @@
 
 #include "project.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /*
  * CGI functions
  */
@@ -102,10 +98,6 @@ extern jb_err cgi_die (struct client_state *csp,
 extern const char cgisimple_rcs[];
 extern const char cgisimple_h_rcs[];
 
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
 #endif /* ndef CGISIMPLE_H_INCLUDED */
 
 /*

diff --git a/deanimate.h b/deanimate.h
index c5f1cad..7dc05e3 100644 (file)
--- a/deanimate.h
+++ b/deanimate.h
@@ -1,6 +1,6 @@
 #ifndef DEANIMATE_H_INCLUDED
 #define DEANIMATE_H_INCLUDED
-#define DEANIMATE_H_VERSION "$Id: deanimate.h,v 1.13 2009/05/16 13:27:20 fabiankeil Exp $"
+#define DEANIMATE_H_VERSION "$Id: deanimate.h,v 1.14 2011/09/04 11:10:56 fabiankeil Exp $"
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/deanimate.h,v $
@@ -43,10 +43,6 @@
  *********************************************************************/
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /*
  * A struct that holds a buffer, a read/write offset,
  * and the buffer's capacity.
@@ -70,10 +66,6 @@ extern void buf_free(struct binbuffer *buf);
 extern const char deanimate_rcs[];
 extern const char deanimate_h_rcs[];
 
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
 #endif /* ndef DEANIMATE_H_INCLUDED */
 
 /*

diff --git a/encode.h b/encode.h
index c6d9394..1329042 100644 (file)
--- a/encode.h
+++ b/encode.h
@@ -1,6 +1,6 @@
 #ifndef ENCODE_H_INCLUDED
 #define ENCODE_H_INCLUDED
-#define ENCODE_H_VERSION "$Id: encode.h,v 1.11 2011/09/04 11:10:56 fabiankeil Exp $"
+#define ENCODE_H_VERSION "$Id: encode.h,v 1.12 2011/11/06 11:44:56 fabiankeil Exp $"
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/encode.h,v $
@@ -36,10 +36,6 @@
  *********************************************************************/
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 extern char * html_encode(const char *s);
 extern char * url_encode(const char *s);
 extern char * url_decode(const char *str);
@@ -51,10 +47,6 @@ extern char * percent_encode_url(const char *s);
 extern const char encode_rcs[];
 extern const char encode_h_rcs[];
 
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
 #endif /* ndef ENCODE_H_INCLUDED */
 
 /*

diff --git a/errlog.h b/errlog.h
index 6ef5bc2..f2934ae 100644 (file)
--- a/errlog.h
+++ b/errlog.h
@@ -1,6 +1,6 @@
 #ifndef ERRLOG_H_INCLUDED
 #define ERRLOG_H_INCLUDED
-#define ERRLOG_H_VERSION "$Id: errlog.h,v 1.28 2012/07/27 17:27:47 fabiankeil Exp $"
+#define ERRLOG_H_VERSION "$Id: errlog.h,v 1.29 2012/07/27 17:39:57 fabiankeil Exp $"
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/errlog.h,v $
@@ -36,10 +36,6 @@
  *********************************************************************/
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Debug level for errors */
 
 /* XXX: Should be renamed. */
@@ -78,10 +74,6 @@ extern const char *jb_err_to_string(int jb_error);
 extern const char errlog_rcs[];
 extern const char errlog_h_rcs[];
 
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
 #endif /* ndef ERRLOG_H_INCLUDED */
 
 /*

diff --git a/filters.h b/filters.h
index 8e56c68..b9b0569 100644 (file)
--- a/filters.h
+++ b/filters.h
@@ -1,6 +1,6 @@
 #ifndef FILTERS_H_INCLUDED
 #define FILTERS_H_INCLUDED
-#define FILTERS_H_VERSION "$Id: filters.h,v 1.43 2011/09/04 11:10:56 fabiankeil Exp $"
+#define FILTERS_H_VERSION "$Id: filters.h,v 1.44 2013/11/06 16:27:37 fabiankeil Exp $"
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/filters.h,v $
@@ -42,11 +42,6 @@
 
 #include "project.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
 /*
  * ACL checking
  */
@@ -114,10 +109,6 @@ extern struct http_response *direct_response(struct client_state *csp);
 extern const char filters_rcs[];
 extern const char filters_h_rcs[];
 
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
 #endif /* ndef FILTERS_H_INCLUDED */
 
 /*

diff --git a/gateway.h b/gateway.h
index 4694a5b..5952f01 100644 (file)
--- a/gateway.h
+++ b/gateway.h
@@ -1,6 +1,6 @@
 #ifndef GATEWAY_H_INCLUDED
 #define GATEWAY_H_INCLUDED
-#define GATEWAY_H_VERSION "$Id: gateway.h,v 1.21 2011/09/04 11:10:56 fabiankeil Exp $"
+#define GATEWAY_H_VERSION "$Id: gateway.h,v 1.22 2012/10/23 10:16:52 fabiankeil Exp $"
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/gateway.h,v $
@@ -37,10 +37,6 @@
  *********************************************************************/
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 struct forward_spec;
 struct http_request;
 struct client_state;
@@ -76,10 +72,6 @@ extern int connection_destination_matches(const struct reusable_connection *conn
 extern const char gateway_rcs[];
 extern const char gateway_h_rcs[];
 
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
 #endif /* ndef GATEWAY_H_INCLUDED */
 
 /*

diff --git a/jbsockets.h b/jbsockets.h
index e41aab2..0064bb8 100644 (file)
--- a/jbsockets.h
+++ b/jbsockets.h
@@ -1,6 +1,6 @@
 #ifndef JBSOCKETS_H_INCLUDED
 #define JBSOCKETS_H_INCLUDED
-#define JBSOCKETS_H_VERSION "$Id: jbsockets.h,v 1.20 2011/09/04 11:10:56 fabiankeil Exp $"
+#define JBSOCKETS_H_VERSION "$Id: jbsockets.h,v 1.21 2012/10/12 11:17:48 fabiankeil Exp $"
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/jbsockets.h,v $
@@ -40,10 +40,6 @@
 
 #include "project.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 struct client_state;
 
 extern jb_socket connect_to(const char *host, int portnum, struct client_state *csp);
@@ -78,10 +74,6 @@ extern const char jbsockets_h_rcs[];
 #endif
 
 
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
 #endif /* ndef JBSOCKETS_H_INCLUDED */
 
 /*

diff --git a/jcc.h b/jcc.h
index 0035a3e..aa8d829 100644 (file)
--- a/jcc.h
+++ b/jcc.h
@@ -1,6 +1,6 @@
 #ifndef JCC_H_INCLUDED
 #define JCC_H_INCLUDED
-#define JCC_H_VERSION "$Id: jcc.h,v 1.31 2011/10/30 16:20:12 fabiankeil Exp $"
+#define JCC_H_VERSION "$Id: jcc.h,v 1.32 2011/11/06 11:48:23 fabiankeil Exp $"
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/jcc.h,v $
@@ -36,10 +36,6 @@
  *********************************************************************/
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 struct client_state;
 struct file_list;
 
@@ -113,10 +109,6 @@ int main(int argc, char **argv);
 extern const char jcc_rcs[];
 extern const char jcc_h_rcs[];
 
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
 #endif /* ndef JCC_H_INCLUDED */
 
 /*

diff --git a/list.h b/list.h
index 5c1a0df..74d3e01 100644 (file)
--- a/list.h
+++ b/list.h
@@ -1,6 +1,6 @@
 #ifndef LIST_H_INCLUDED
 #define LIST_H_INCLUDED
-#define LIST_H_VERSION "$Id: list.h,v 1.17 2010/11/22 10:32:40 fabiankeil Exp $"
+#define LIST_H_VERSION "$Id: list.h,v 1.18 2011/09/04 11:10:56 fabiankeil Exp $"
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/list.h,v $
@@ -39,11 +39,6 @@
 
 #include "project.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
 /*
  * struct list
  *
@@ -94,10 +89,6 @@ extern const char * lookup   (const struct map * the_map, const char * name);
 extern const char list_rcs[];
 extern const char list_h_rcs[];
 
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
 #endif /* ndef LIST_H_INCLUDED */
 
 /*

diff --git a/loadcfg.h b/loadcfg.h
index 302cd32..289b722 100644 (file)
--- a/loadcfg.h
+++ b/loadcfg.h
@@ -1,6 +1,6 @@
 #ifndef LOADCFG_H_INCLUDED
 #define LOADCFG_H_INCLUDED
-#define LOADCFG_H_VERSION "$Id: loadcfg.h,v 1.15 2009/09/10 14:45:17 fabiankeil Exp $"
+#define LOADCFG_H_VERSION "$Id: loadcfg.h,v 1.16 2011/09/04 11:10:56 fabiankeil Exp $"
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/loadcfg.h,v $
@@ -38,10 +38,6 @@
  *********************************************************************/
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Don't need project.h, only this: */
 struct configuration_spec;
 
@@ -75,10 +71,6 @@ void unload_current_config_file(void);
 extern const char loadcfg_rcs[];
 extern const char loadcfg_h_rcs[];
 
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
 #endif /* ndef LOADCFG_H_INCLUDED */
 
 /*

diff --git a/loaders.h b/loaders.h
index 8ff00bc..5e65402 100644 (file)
--- a/loaders.h
+++ b/loaders.h
@@ -1,6 +1,6 @@
 #ifndef LOADERS_H_INCLUDED
 #define LOADERS_H_INCLUDED
-#define LOADERS_H_VERSION "$Id: loaders.h,v 1.30 2012/12/07 12:43:05 fabiankeil Exp $"
+#define LOADERS_H_VERSION "$Id: loaders.h,v 1.31 2013/11/06 16:27:37 fabiankeil Exp $"
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/loaders.h,v $
@@ -38,10 +38,6 @@
  *********************************************************************/
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 extern unsigned int sweep(void);
 extern char *read_config_line(FILE *fp, unsigned long *linenum, char **buf);
 extern int check_file_changed(const struct file_list * current,
@@ -102,10 +98,6 @@ extern int any_loaded_file_changed(const struct client_state *csp);
 extern const char loaders_rcs[];
 extern const char loaders_h_rcs[];
 
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
 #endif /* ndef LOADERS_H_INCLUDED */
 
 /*

diff --git a/parsers.h b/parsers.h
index 7f958a5..20d1379 100644 (file)
--- a/parsers.h
+++ b/parsers.h
@@ -1,6 +1,6 @@
 #ifndef PARSERS_H_INCLUDED
 #define PARSERS_H_INCLUDED
-#define PARSERS_H_VERSION "$Id: parsers.h,v 1.54 2012/10/21 12:58:03 fabiankeil Exp $"
+#define PARSERS_H_VERSION "$Id: parsers.h,v 1.55 2012/12/07 12:43:55 fabiankeil Exp $"
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/parsers.h,v $
@@ -46,10 +46,6 @@
 
 #include "project.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Used for sed()'s second argument. */
 #define FILTER_CLIENT_HEADERS 0
 #define FILTER_SERVER_HEADERS 1
@@ -75,10 +71,6 @@ extern int strclean(char *string, const char *substring);
 extern const char parsers_rcs[];
 extern const char parsers_h_rcs[];
 
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
 #endif /* ndef PARSERS_H_INCLUDED */
 
 /*

diff --git a/pcrs.h b/pcrs.h
index 9b6acd8..9798db1 100644 (file)
--- a/pcrs.h
+++ b/pcrs.h
@@ -11,17 +11,13 @@
  *
  *********************************************************************/
 
-#define PCRS_H_VERSION "$Id: pcrs.h,v 1.16 2007/04/30 15:02:19 fabiankeil Exp $"
+#define PCRS_H_VERSION "$Id: pcrs.h,v 1.17 2009/05/16 13:27:20 fabiankeil Exp $"
 
 
 #ifndef _PCRE_H
 #include <pcre.h>
 #endif
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /*
  * Constants:
  */
@@ -137,10 +133,6 @@ extern pcrs_job *pcrs_compile_dynamic_command(char *pcrs_command, const struct p
 #define PCRS_BUFFER_SIZE 4000
 #endif /* ndef PCRS_BUFFER_SIZE */
 
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
 #endif /* ndef PCRS_H_INCLUDED */
 
 /*

diff --git a/project.h b/project.h
index 79827dc..efcb456 100644 (file)
--- a/project.h
+++ b/project.h
@@ -1,7 +1,7 @@
 #ifndef PROJECT_H_INCLUDED
 #define PROJECT_H_INCLUDED
 /** Version string. */
-#define PROJECT_H_VERSION "$Id: project.h,v 1.197 2013/11/24 14:21:58 fabiankeil Exp $"
+#define PROJECT_H_VERSION "$Id: project.h,v 1.198 2013/11/24 14:22:51 fabiankeil Exp $"
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/project.h,v $
@@ -108,10 +108,6 @@
 #endif
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #ifdef _WIN32
 
 typedef SOCKET jb_socket;
@@ -1405,10 +1401,6 @@ struct configuration_spec
  */
 #define CGI_PREFIX  "http://" CGI_SITE_2_HOST CGI_SITE_2_PATH "/"
 
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
 #endif /* ndef PROJECT_H_INCLUDED */
 
 /*

diff --git a/ssplit.h b/ssplit.h
index 99335db..106177b 100644 (file)
--- a/ssplit.h
+++ b/ssplit.h
@@ -1,6 +1,6 @@
 #ifndef SSPLIT_H_INCLUDED
 #define SSPLIT_H_INCLUDED
-#define SSPLIT_H_VERSION "$Id: ssplit.h,v 1.10 2011/09/04 11:10:56 fabiankeil Exp $"
+#define SSPLIT_H_VERSION "$Id: ssplit.h,v 1.11 2012/06/08 15:15:11 fabiankeil Exp $"
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/ssplit.h,v $
@@ -35,20 +35,12 @@
  *********************************************************************/
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 extern int ssplit(char *str, const char *delim, char *vec[], size_t vec_len);
 
 /* Revision control strings from this header and associated .c file */
 extern const char ssplit_rcs[];
 extern const char ssplit_h_rcs[];
 
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
 #endif /* ndef SSPLIT_H_INCLUDED */
 
 /*

diff --git a/urlmatch.h b/urlmatch.h
index 7ba4fd7..67f59d0 100644 (file)
--- a/urlmatch.h
+++ b/urlmatch.h
@@ -1,6 +1,6 @@
 #ifndef URLMATCH_H_INCLUDED
 #define URLMATCH_H_INCLUDED
-#define URLMATCH_H_VERSION "$Id: urlmatch.h,v 1.18 2011/11/06 11:41:05 fabiankeil Exp $"
+#define URLMATCH_H_VERSION "$Id: urlmatch.h,v 1.19 2013/11/24 14:22:51 fabiankeil Exp $"
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/urlmatch.h,v $
@@ -38,10 +38,6 @@
 
 #include "project.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 extern void free_http_request(struct http_request *http);
 #ifndef FEATURE_EXTENDED_HOST_PATTERNS
 extern jb_err init_domain_components(struct http_request *http);
@@ -67,10 +63,6 @@ extern jb_err parse_forwarder_address(char *address, char **hostname, int *port)
 extern const char urlmatch_rcs[];
 extern const char urlmatch_h_rcs[];
 
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
 #endif /* ndef URLMATCH_H_INCLUDED */
 
 /*

diff --git a/w32log.h b/w32log.h
index 837a8b6..b20917e 100644 (file)
--- a/w32log.h
+++ b/w32log.h
@@ -1,6 +1,6 @@
 #ifndef W32LOG_H_INCLUDED
 #define W32LOG_H_INCLUDED
-#define W32LOG_H_VERSION "$Id: w32log.h,v 1.15 2010/08/14 23:28:52 ler762 Exp $"
+#define W32LOG_H_VERSION "$Id: w32log.h,v 1.16 2011/09/04 11:10:56 fabiankeil Exp $"
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/w32log.h,v $
@@ -35,10 +35,6 @@
  *********************************************************************/
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 extern HWND g_hwndLogFrame;
 
 /* Indicates whether task bar shows activity animation */
@@ -92,10 +88,6 @@ extern void LogShowActivity(void);
 extern const char w32log_rcs[];
 extern const char w32log_h_rcs[];
 
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
 #endif /* ndef W32LOG_H_INCLUDED */
 
 

diff --git a/w32svrapi.h b/w32svrapi.h
index ae1ea7d..4f070ef 100644 (file)
--- a/w32svrapi.h
+++ b/w32svrapi.h
@@ -1,6 +1,6 @@
 #ifndef W32_SVRAPI_H_INCLUDED
 #define W32_SVRAPI_H_INCLUDED
-#define W32_SVRAPI_H_VERSION "$Id: w32svrapi.h,v 1.2 2009/05/16 13:27:20 fabiankeil Exp $"
+#define W32_SVRAPI_H_VERSION "$Id: w32svrapi.h,v 1.3 2011/09/04 11:10:56 fabiankeil Exp $"
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/w32svrapi.h,v $
@@ -50,10 +50,6 @@
  *********************************************************************/
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #ifdef _WIN32
 
 
@@ -131,9 +127,5 @@ extern BOOL w32_set_service_status(
 #endif  /* def _WIN32 */
 
 
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
 #endif /* ndef W32_SVRAPI_H_INCLUDED */
 

diff --git a/w32taskbar.h b/w32taskbar.h
index 6daefdc..760eb2d 100644 (file)
--- a/w32taskbar.h
+++ b/w32taskbar.h
@@ -1,6 +1,6 @@
 #ifndef W32TASKBAR_H_INCLUDED
 #define W32TASKBAR_H_INCLUDED
-#define W32TASKBAR_H_VERSION "$Id: w32taskbar.h,v 1.7 2009/05/16 13:27:20 fabiankeil Exp $"
+#define W32TASKBAR_H_VERSION "$Id: w32taskbar.h,v 1.8 2011/09/04 11:10:56 fabiankeil Exp $"
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/w32taskbar.h,v $
@@ -35,10 +35,6 @@
  *********************************************************************/
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 extern HWND CreateTrayWindow(HINSTANCE hInstance);
 extern BOOL TrayAddIcon(HWND hwnd, UINT uID, HICON hicon, const char *pszToolTip);
 extern BOOL TraySetIcon(HWND hwnd, UINT uID, HICON hicon);
@@ -48,10 +44,6 @@ extern BOOL TrayDeleteIcon(HWND hwnd, UINT uID);
 extern const char w32taskbar_rcs[];
 extern const char w32taskbar_h_rcs[];
 
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
 #endif /* ndef W32TASKBAR_H_INCLUDED */
 
 

diff --git a/win32.h b/win32.h
index 4437f80..9baeead 100644 (file)
--- a/win32.h
+++ b/win32.h
@@ -1,6 +1,6 @@
 #ifndef WIN32_H_INCLUDED
 #define WIN32_H_INCLUDED
-#define WIN32_H_VERSION "$Id: win32.h,v 1.8 2009/05/16 13:27:20 fabiankeil Exp $"
+#define WIN32_H_VERSION "$Id: win32.h,v 1.9 2011/09/04 11:10:56 fabiankeil Exp $"
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/win32.h,v $
@@ -34,10 +34,6 @@
  *********************************************************************/
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 extern const char win32_blurb[];
 
 extern void InitWin32(void);
@@ -55,10 +51,6 @@ extern int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lp
 extern const char win32_rcs[];
 extern const char win32_h_rcs[];
 
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
 #endif /* ndef WIN32_H_INCLUDED */
 
 /*