Mercurial > projects > ddmd

diff dmd/StructDeclaration.d @ 95:ae5b11064a9a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
beginning of 2.036 branch
author Trass3r
date Mon, 30 Aug 2010 23:08:44 +0200
parents 37b95c347975
children e6090d1aea7c
line wrap: on
line diff
--- a/dmd/StructDeclaration.d	Mon Aug 30 22:50:30 2010 +0200
+++ b/dmd/StructDeclaration.d	Mon Aug 30 23:08:44 2010 +0200
@@ -740,7 +740,8 @@
 
 				toDt(&sinit.Sdt);
 
-version (OMFOBJ) {
+version (OMFOBJ)
+{
 				/* For OMF, common blocks aren't pulled in from the library.
 				 */
 				/* ELF comdef's generate multiple
@@ -749,7 +750,8 @@
 				 */
 				// See if we can convert a comdat to a comdef,
 				// which saves on exe file space.
-				if (sinit.Sclass == SCcomdat &&
+				if (0 && // causes multiple def problems with COMMON in one file and COMDAT in library
+				    sinit.Sclass == SCcomdat &&
 					sinit.Sdt &&
 					sinit.Sdt.dt == DT.DT_azeros &&
 					sinit.Sdt.DTnext == null &&