Patch from Enrico Tröger to change comments in header files to C Style /*

rather than C++ style // so that some compilers will work.

4 files changed, 54 insertions, 54 deletions

diff --git a/include/HFacer.py b/include/HFacer.py
index b3c8c2896..1b4d62746 100644
--- a/include/HFacer.py
+++ b/include/HFacer.py
@@ -1,7 +1,7 @@
 # HFacer.py - regenerate the Scintilla.h and SciLexer.h files from the Scintilla.iface interface
 # definition file.
-# The header files are copied to a temporary file apart from the section between a //++Autogenerated
-# comment and a //--Autogenerated comment which is generated by the printHFile and printLexHFile
+# The header files are copied to a temporary file apart from the section between a /* ++Autogenerated*/
+# comment and a /* --Autogenerated*/ comment which is generated by the printHFile and printLexHFile
 # functions. After the temporary file is created, it is copied back to the original file name.
 
 import string
@@ -38,10 +38,10 @@ def CopyWithInsertion(input, output, genfn, definition):
 	for line in input.readlines():
 		if copying:
 			output.write(line)
-		if Contains(line, "//++Autogenerated"):
+		if Contains(line, "/* ++Autogenerated"):
 			copying = 0
 			genfn(definition, output)
-		if Contains(line, "//--Autogenerated"):
+		if Contains(line, "/* --Autogenerated"):
 			copying = 1
 			output.write(line)
 
diff --git a/include/SciLexer.h b/include/SciLexer.h
index 946f2affb..982b48b7b 100644
--- a/include/SciLexer.h
+++ b/include/SciLexer.h
@@ -1,19 +1,19 @@
-// Scintilla source code edit control
+/* Scintilla source code edit control */
 /** @file SciLexer.h
  ** Interface to the added lexer functions in the SciLexer version of the edit control.
  **/
-// Copyright 1998-2002 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
+/* Copyright 1998-2002 by Neil Hodgson <neilh@scintilla.org>
+ * The License.txt file describes the conditions under which this software may be distributed. */
 
-// Most of this file is automatically generated from the Scintilla.iface interface definition
-// file which contains any comments about the definitions. HFacer.py does the generation.
+/* Most of this file is automatically generated from the Scintilla.iface interface definition
+ * file which contains any comments about the definitions. HFacer.py does the generation. */
 
 #ifndef SCILEXER_H
 #define SCILEXER_H
 
-// SciLexer features - not in standard Scintilla
+/* SciLexer features - not in standard Scintilla */
 
-//++Autogenerated -- start of section automatically generated from Scintilla.iface
+/* ++Autogenerated -- start of section automatically generated from Scintilla.iface */
 #define SCLEX_CONTAINER 0
 #define SCLEX_NULL 1
 #define SCLEX_PYTHON 2
@@ -1320,6 +1320,6 @@
 #define SCE_POWERPRO_FUNCTION 16
 #define SCLEX_ASP 29
 #define SCLEX_PHP 30
-//--Autogenerated -- end of section automatically generated from Scintilla.iface
+/* --Autogenerated -- end of section automatically generated from Scintilla.iface */
 
 #endif
diff --git a/include/Scintilla.h b/include/Scintilla.h
index 2b2f28d5a..d3944515f 100644
--- a/include/Scintilla.h
+++ b/include/Scintilla.h
@@ -1,12 +1,12 @@
-// Scintilla source code edit control
+/* Scintilla source code edit control */
 /** @file Scintilla.h
  ** Interface to the edit control.
  **/
-// Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
+/* Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org>
+ * The License.txt file describes the conditions under which this software may be distributed. */
 
-// Most of this file is automatically generated from the Scintilla.iface interface definition
-// file which contains any comments about the definitions. HFacer.py does the generation.
+/* Most of this file is automatically generated from the Scintilla.iface interface definition
+ * file which contains any comments about the definitions. HFacer.py does the generation. */
 
 #ifndef SCINTILLA_H
 #define SCINTILLA_H
@@ -16,15 +16,15 @@ typedef BOOL bool;
 #endif
 
 #if PLAT_WIN
-// Return false on failure:
+/* Return false on failure: */
 bool Scintilla_RegisterClasses(void *hInstance);
 bool Scintilla_ReleaseResources();
 #endif
 int Scintilla_LinkLexers();
 
-// Here should be placed typedefs for uptr_t, an unsigned integer type large enough to
-// hold a pointer and sptr_t, a signed integer large enough to hold a pointer.
-// May need to be changed for 64 bit platforms.
+/* Here should be placed typedefs for uptr_t, an unsigned integer type large enough to
+ * hold a pointer and sptr_t, a signed integer large enough to hold a pointer.
+ * May need to be changed for 64 bit platforms. */
 #if _MSC_VER >= 1300
 #include <BaseTsd.h>
 #endif
@@ -38,7 +38,7 @@ typedef long sptr_t;
 
 typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam, sptr_t lParam);
 
-//++Autogenerated -- start of section automatically generated from Scintilla.iface
+/* ++Autogenerated -- start of section automatically generated from Scintilla.iface */
 #define INVALID_POSITION -1
 #define SCI_START 2000
 #define SCI_OPTIONAL_START 3000
@@ -755,11 +755,11 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam,
 #define SCN_INDICATORRELEASE 2024
 #define SCN_AUTOCCANCELLED 2025
 #define SCN_AUTOCCHARDELETED 2026
-//--Autogenerated -- end of section automatically generated from Scintilla.iface
+/* --Autogenerated -- end of section automatically generated from Scintilla.iface */
 
-// These structures are defined to be exactly the same shape as the Win32
-// CHARRANGE, TEXTRANGE, FINDTEXTEX, FORMATRANGE, and NMHDR structs.
-// So older code that treats Scintilla as a RichEdit will work.
+/* These structures are defined to be exactly the same shape as the Win32
+ * CHARRANGE, TEXTRANGE, FINDTEXTEX, FORMATRANGE, and NMHDR structs.
+ * So older code that treats Scintilla as a RichEdit will work. */
 
 #ifdef SCI_NAMESPACE
 namespace Scintilla {
@@ -783,8 +783,8 @@ struct TextToFind {
 
 #ifdef PLATFORM_H
 
-// This structure is used in printing and requires some of the graphics types
-// from Platform.h.  Not needed by most client code.
+/* This structure is used in printing and requires some of the graphics types
+ * from Platform.h.  Not needed by most client code. */
 
 struct RangeToFormat {
 	SurfaceID hdc;
@@ -797,9 +797,9 @@ struct RangeToFormat {
 #endif
 
 struct NotifyHeader {
-	// Compatible with Windows NMHDR.
-	// hwndFrom is really an environment specific window handle or pointer
-	// but most clients of Scintilla.h do not have this type visible.
+	/* Compatible with Windows NMHDR.
+	 * hwndFrom is really an environment specific window handle or pointer
+	 * but most clients of Scintilla.h do not have this type visible. */
 	void *hwndFrom;
 	uptr_t idFrom;
 	unsigned int code;
@@ -807,32 +807,32 @@ struct NotifyHeader {
 
 struct SCNotification {
 	struct NotifyHeader nmhdr;
-	int position;	// SCN_STYLENEEDED, SCN_MODIFIED, SCN_DWELLSTART, SCN_DWELLEND
-	int ch;		// SCN_CHARADDED, SCN_KEY
-	int modifiers;	// SCN_KEY
-	int modificationType;	// SCN_MODIFIED
-	const char *text;	// SCN_MODIFIED, SCN_USERLISTSELECTION, SCN_AUTOCSELECTION
-	int length;		// SCN_MODIFIED
-	int linesAdded;	// SCN_MODIFIED
-	int message;	// SCN_MACRORECORD
-	uptr_t wParam;	// SCN_MACRORECORD
-	sptr_t lParam;	// SCN_MACRORECORD
-	int line;		// SCN_MODIFIED
-	int foldLevelNow;	// SCN_MODIFIED
-	int foldLevelPrev;	// SCN_MODIFIED
-	int margin;		// SCN_MARGINCLICK
-	int listType;	// SCN_USERLISTSELECTION
-	int x;			// SCN_DWELLSTART, SCN_DWELLEND
-	int y;		// SCN_DWELLSTART, SCN_DWELLEND
+	int position;	/* SCN_STYLENEEDED, SCN_MODIFIED, SCN_DWELLSTART, SCN_DWELLEND */
+	int ch;		/* SCN_CHARADDED, SCN_KEY */
+	int modifiers;	/* SCN_KEY */
+	int modificationType;	/* SCN_MODIFIED */
+	const char *text;	// SCN_MODIFIED, SCN_USERLISTSELECTION, SCN_AUTOCSELECTION */
+	int length;		/* SCN_MODIFIED */
+	int linesAdded;	/* SCN_MODIFIED */
+	int message;	/* SCN_MACRORECORD */
+	uptr_t wParam;	/* SCN_MACRORECORD */
+	sptr_t lParam;	/* SCN_MACRORECORD */
+	int line;		/* SCN_MODIFIED */
+	int foldLevelNow;	/* SCN_MODIFIED */
+	int foldLevelPrev;	/* SCN_MODIFIED */
+	int margin;		/* SCN_MARGINCLICK */
+	int listType;	/* SCN_USERLISTSELECTION */
+	int x;			/* SCN_DWELLSTART, SCN_DWELLEND */
+	int y;		/* SCN_DWELLSTART, SCN_DWELLEND */
 };
 
 #ifdef SCI_NAMESPACE
 }
 #endif
 
-// Deprecation section listing all API features that are deprecated and will
-// will be removed completely in a future version.
-// To enable these features define INCLUDE_DEPRECATED_FEATURES
+/* Deprecation section listing all API features that are deprecated and will
+ * will be removed completely in a future version.
+ * To enable these features define INCLUDE_DEPRECATED_FEATURES */
 
 #ifdef INCLUDE_DEPRECATED_FEATURES
 
diff --git a/include/ScintillaWidget.h b/include/ScintillaWidget.h
index 9d23ce2a9..c60c4a21b 100644
--- a/include/ScintillaWidget.h
+++ b/include/ScintillaWidget.h
@@ -1,10 +1,10 @@
-// Scintilla source code edit control
+/* Scintilla source code edit control */
 /** @file ScintillaWidget.h
  ** Definition of Scintilla widget for GTK+.
  ** Only needed by GTK+ code but is harmless on other platforms.
  **/
-// Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
+/* Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>
+ * The License.txt file describes the conditions under which this software may be distributed. */
 
 #ifndef SCINTILLAWIDGET_H
 #define SCINTILLAWIDGET_H