[m-rev.] trivial diff: update list of reserved macro names for MinGW64

Julien Fischer jfischer at opturion.com
Wed Apr 3 15:21:07 AEDT 2013


Update the list of reserved macro names.

browser/RESERVED_MACRO_NAMES:
library/RESERVED_MACRO_NAMES:
mdbcomp/RESERVED_MACRO_NAMES:
runtime/RESERVED_MACRO_NAMES:
ssdb/RESERVED_MACRO_NAMES:
trace/RESERVED_MACRO_NAMES:
	Ignore the __USE_MINGW_ANSI_STDIO macro which we
	need to define on MinGW64.

	Ignore the __GCC_HAVE_DWARF2_CFI_ASM macro which
	some versions of GCC define if -g is enabled.

compiler/.gitignore:
deep_profiler/.gitignore:
profiler/.gitignore:
slice/.gitignore:
util/.gitignore:
	Have git ignore .exe files in these directories.

Julien.

diff --git a/browser/RESERVED_MACRO_NAMES b/browser/RESERVED_MACRO_NAMES
index fd2d513..9fc9745 100644
--- a/browser/RESERVED_MACRO_NAMES
+++ b/browser/RESERVED_MACRO_NAMES
@@ -74,3 +74,6 @@ __pentiumpro__
 _REENTRANT
 _THREAD_SAFE
 #-----------------------------------------------------------------------------#
+# This is defined on MinGW64 to workaround limitations in the Windows libc.
+__USE_MINGW_ANSI_STDIO
+#-----------------------------------------------------------------------------#
diff --git a/compiler/.gitignore b/compiler/.gitignore
index a533075..99042d3 100644
--- a/compiler/.gitignore
+++ b/compiler/.gitignore
@@ -3,6 +3,7 @@
 *.c
 *.d
 *.h
+*.exe
 *.ql
 *.pl
 *.prof
diff --git a/deep_profiler/.gitignore b/deep_profiler/.gitignore
index 10cc6f9..baa5000 100644
--- a/deep_profiler/.gitignore
+++ b/deep_profiler/.gitignore
@@ -9,6 +9,7 @@
 *.pl
 *.prof
 *.err
+*.exe
 *.int
 *.int0
 *.int2
diff --git a/library/RESERVED_MACRO_NAMES b/library/RESERVED_MACRO_NAMES
index 688ae00..7bf67bd 100644
--- a/library/RESERVED_MACRO_NAMES
+++ b/library/RESERVED_MACRO_NAMES
@@ -86,3 +86,6 @@ mercury__exception__builtin_catch_3_p_5
 _REENTRANT
 _THREAD_SAFE
 #-----------------------------------------------------------------------------#
+# This is defined on MinGW64 to workaround limitations in the Windows libc.
+__USE_MINGW_ANSI_STDIO
+#-----------------------------------------------------------------------------#
diff --git a/mdbcomp/RESERVED_MACRO_NAMES b/mdbcomp/RESERVED_MACRO_NAMES
index fd2d513..9fc9745 100644
--- a/mdbcomp/RESERVED_MACRO_NAMES
+++ b/mdbcomp/RESERVED_MACRO_NAMES
@@ -74,3 +74,6 @@ __pentiumpro__
 _REENTRANT
 _THREAD_SAFE
 #-----------------------------------------------------------------------------#
+# This is defined on MinGW64 to workaround limitations in the Windows libc.
+__USE_MINGW_ANSI_STDIO
+#-----------------------------------------------------------------------------#
diff --git a/profiler/.gitignore b/profiler/.gitignore
index a195976..8462741 100644
--- a/profiler/.gitignore
+++ b/profiler/.gitignore
@@ -9,6 +9,7 @@
 *.pl
 *.prof
 *.err
+*.exe
 *.int
 *.int0
 *.int2
diff --git a/runtime/RESERVED_MACRO_NAMES b/runtime/RESERVED_MACRO_NAMES
index 1c12292..92e6363 100644
--- a/runtime/RESERVED_MACRO_NAMES
+++ b/runtime/RESERVED_MACRO_NAMES
@@ -83,3 +83,6 @@ _THREAD_SAFE
 # This is defined on Windows to workaround problems with windows.h.
 WIN32_LEAN_AND_MEAN
 #-----------------------------------------------------------------------------#
+# This is defined on MinGW64 to workaround limitations in the Windows libc.
+__USE_MINGW_ANSI_STDIO
+#-----------------------------------------------------------------------------#
diff --git a/slice/.gitignore b/slice/.gitignore
index e0121ad..6d78f81 100644
--- a/slice/.gitignore
+++ b/slice/.gitignore
@@ -12,6 +12,7 @@ mcov
 *.dep
 *.dv
 *.err
+*.exe
 *.int
 *.int0
 *.int2
diff --git a/trace/RESERVED_MACRO_NAMES b/trace/RESERVED_MACRO_NAMES
index 0abf80c..4590e8c 100644
--- a/trace/RESERVED_MACRO_NAMES
+++ b/trace/RESERVED_MACRO_NAMES
@@ -74,8 +74,11 @@ __i686
 __i686__
 __pentiumpro
 __pentiumpro__
+__GCC_HAVE_DWARF2_CFI_ASM
 #-----------------------------------------------------------------------------#
 # These are defined in when threads are enabled.
 _REENTRANT
 _THREAD_SAFE
 #-----------------------------------------------------------------------------#
+# This is defined on MinGW64 to workaround limitations in the Windows libc.
+__USE_MINGW_ANSI_STDIO
diff --git a/util/.gitignore b/util/.gitignore
index 35d108f..1ebd100 100644
--- a/util/.gitignore
+++ b/util/.gitignore
@@ -4,3 +4,4 @@ mdemangle
 mfiltercc
 info_to_mdb
 pad_backslash
+*.exe



More information about the reviews mailing list