snapshot of project "lynx", label v2-8-6dev_10

1 files changed, 65 insertions, 58 deletions

diff --git a/src/LYCharSets.h b/src/LYCharSets.h
index 26a852a1..a0f0c26a 100644
--- a/src/LYCharSets.h
+++ b/src/LYCharSets.h
@@ -11,42 +11,46 @@
 #include <UCMap.h>
 #endif /* !UCMAP_H */
 
-extern BOOL HTPassEightBitRaw;
-extern BOOL HTPassEightBitNum;
-extern BOOL HTPassHighCtrlRaw;
-extern BOOL HTPassHighCtrlNum;
-extern BOOLEAN LYHaveCJKCharacterSet;
-extern BOOLEAN DisplayCharsetMatchLocale;
-
 #include <HTCJK.h>
-extern HTkcode kanji_code;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+    extern BOOL HTPassEightBitRaw;
+    extern BOOL HTPassEightBitNum;
+    extern BOOL HTPassHighCtrlRaw;
+    extern BOOL HTPassHighCtrlNum;
+    extern BOOLEAN LYHaveCJKCharacterSet;
+    extern BOOLEAN DisplayCharsetMatchLocale;
+
+    extern HTkcode kanji_code;
 
 /*
  *  currently active character set (internal handler)
  */
-extern int current_char_set;
+    extern int current_char_set;
 
 /*
  *  Initializer, calls initialization function for the
  *  CHARTRANS handling. - KW
  */
-extern int LYCharSetsDeclared(void);
-
-extern const char **LYCharSets[];
-extern const char *SevenBitApproximations[];
-extern const char **p_entity_values;
-extern const char *LYchar_set_names[];	/* Full name, not MIME */
-extern int LYlowest_eightbit[];
-extern int LYNumCharsets;
-extern LYUCcharset LYCharSet_UC[];
-extern int UCGetLYhndl_byAnyName(char *value);
-extern void HTMLSetCharacterHandling(int i);
-extern void HTMLSetUseDefaultRawMode(int i, BOOLEAN modeflag);
-extern void HTMLUseCharacterSet(int i);
-extern UCode_t HTMLGetEntityUCValue(const char *name);
-extern void Set_HTCJK(const char *inMIMEname, const char *outMIMEname);
-
-extern const char *HTMLGetEntityName(UCode_t code);
+    extern int LYCharSetsDeclared(void);
+
+    extern const char **LYCharSets[];
+    extern const char *SevenBitApproximations[];
+    extern const char **p_entity_values;
+    extern const char *LYchar_set_names[];	/* Full name, not MIME */
+    extern int LYlowest_eightbit[];
+    extern int LYNumCharsets;
+    extern LYUCcharset LYCharSet_UC[];
+    extern int UCGetLYhndl_byAnyName(char *value);
+    extern void HTMLSetCharacterHandling(int i);
+    extern void HTMLSetUseDefaultRawMode(int i, BOOLEAN modeflag);
+    extern void HTMLUseCharacterSet(int i);
+    extern UCode_t HTMLGetEntityUCValue(const char *name);
+    extern void Set_HTCJK(const char *inMIMEname, const char *outMIMEname);
+
+    extern const char *HTMLGetEntityName(UCode_t code);
 
 /*
  * HTMLGetEntityName calls LYEntityNames for iso-8859-1 entity names only. 
@@ -54,24 +58,24 @@ extern const char *HTMLGetEntityName(UCode_t code);
  * unicode number in general may have several equivalent entity names because
  * of synonyms.
  */
-extern BOOL force_old_UCLYhndl_on_reload;
-extern int forced_UCLYhdnl;
+    extern BOOL force_old_UCLYhndl_on_reload;
+    extern int forced_UCLYhdnl;
 
 #ifndef  EXP_CHARSET_CHOICE
 # define ALL_CHARSETS_IN_O_MENU_SCREEN 1
 #endif
 
 #ifdef EXP_CHARSET_CHOICE
-typedef struct {
-    BOOL hide_display;		/* if FALSE, show in "display-charset" menu */
-    BOOL hide_assumed;		/* if FALSE, show in "assumed-charset" menu */
+    typedef struct {
+	BOOL hide_display;	/* if FALSE, show in "display-charset" menu */
+	BOOL hide_assumed;	/* if FALSE, show in "assumed-charset" menu */
 #ifndef ALL_CHARSETS_IN_O_MENU_SCREEN
-    int assumed_idx;		/* only this field is needed */
+	int assumed_idx;	/* only this field is needed */
 #endif
-} charset_subset_t;
+    } charset_subset_t;
 
 /* each element corresponds to charset in LYCharSets */
-extern charset_subset_t charset_subsets[];
+    extern charset_subset_t charset_subsets[];
 
 /* all zeros by default - i.e., all charsets allowed */
 
@@ -80,10 +84,10 @@ extern charset_subset_t charset_subsets[];
  * lynx.cfg.  It will remain FALSE if no "display_charset_choice" settings were
  * encountered in lynx.cfg
  */
-extern BOOL custom_display_charset;
+    extern BOOL custom_display_charset;
 
 /* similar to custom_display_charset */
-extern BOOL custom_assumed_doc_charset;
+    extern BOOL custom_assumed_doc_charset;
 
 #ifndef ALL_CHARSETS_IN_O_MENU_SCREEN
 
@@ -92,19 +96,19 @@ extern BOOL custom_assumed_doc_charset;
 /*
  * These arrays map index of charset shown in menu to the index in LYCharsets[]
  */
-extern int display_charset_map[];
-extern int assumed_doc_charset_map[];
+    extern int display_charset_map[];
+    extern int assumed_doc_charset_map[];
 
 /* these arrays are NULL terminated */
-extern const char *display_charset_choices[];
-extern const char *assumed_charset_choices[];
+    extern const char *display_charset_choices[];
+    extern const char *assumed_charset_choices[];
 
-extern int displayed_display_charset_idx;
+    extern int displayed_display_charset_idx;
 
 #endif
 /* this will be called after lynx.cfg and .lynxrc are read */
-extern void init_charset_subsets(void);
-#endif /* EXP_CHARSET_CHOICE */
+    extern void init_charset_subsets(void);
+#endif				/* EXP_CHARSET_CHOICE */
 
 #if !defined(NO_AUTODETECT_DISPLAY_CHARSET)
 #  ifdef __EMX__
@@ -116,23 +120,26 @@ extern void init_charset_subsets(void);
 #endif
 
 #ifdef CAN_AUTODETECT_DISPLAY_CHARSET
-extern int auto_display_charset;
+    extern int auto_display_charset;
 #endif
 
 #ifdef CAN_SWITCH_DISPLAY_CHARSET
-enum switch_display_charset_t {
-    SWITCH_DISPLAY_CHARSET_MAYBE,
-    SWITCH_DISPLAY_CHARSET_REALLY,
-    SWITCH_DISPLAY_CHARSET_RESIZE
-};
-extern int Switch_Display_Charset(int ord, enum switch_display_charset_t really);
-extern int Find_Best_Display_Charset(int ord);
-extern char *charsets_directory;
-extern char *charset_switch_rules;
-extern int switch_display_charsets;
-extern int auto_other_display_charset;
-extern int codepages[2];
-extern int real_charsets[2];	/* Non "auto-" charsets for the codepages */
+    enum switch_display_charset_t {
+	SWITCH_DISPLAY_CHARSET_MAYBE,
+	SWITCH_DISPLAY_CHARSET_REALLY,
+	SWITCH_DISPLAY_CHARSET_RESIZE
+    };
+    extern int Switch_Display_Charset(int ord, enum switch_display_charset_t really);
+    extern int Find_Best_Display_Charset(int ord);
+    extern char *charsets_directory;
+    extern char *charset_switch_rules;
+    extern int switch_display_charsets;
+    extern int auto_other_display_charset;
+    extern int codepages[2];
+    extern int real_charsets[2];	/* Non "auto-" charsets for the codepages */
 #endif
 
-#endif /* LYCHARSETS_H */
+#ifdef __cplusplus
+}
+#endif
+#endif				/* LYCHARSETS_H */