SF.net SVN: edk2-buildtools:[2406] trunk/BaseTools/Source/Python/AutoGen/ GenC.py

[<js...@us...>]

Revision: 2406
          http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=2406&view=rev
Author:   jsu1
Date:     2011-11-15 08:27:59 +0000 (Tue, 15 Nov 2011)
Log Message:
-----------
remove CPP conditional clause from StrDefs.h file as these files do not include function declarations

Reviewed-by: lgao4
Signed-off-by: jsu1

Modified Paths:
--------------
    trunk/BaseTools/Source/Python/AutoGen/GenC.py

Modified: trunk/BaseTools/Source/Python/AutoGen/GenC.py
===================================================================
--- trunk/BaseTools/Source/Python/AutoGen/GenC.py	2011-11-15 07:21:21 UTC (rev 2405)
+++ trunk/BaseTools/Source/Python/AutoGen/GenC.py	2011-11-15 08:27:59 UTC (rev 2406)
@@ -310,11 +310,14 @@
 #ifndef _${File}_${Guid}
 #define _${File}_${Guid}
 
+""")
+
+gAutoGenHCppPrologueString = """
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-""")
+"""
 
 gAutoGenHEpilogueString = """
 
@@ -1970,6 +1973,7 @@
     AutoGenH.Append(gAutoGenHeaderString.Replace({'FileName':'AutoGen.h'}))
     # header file Prologue
     AutoGenH.Append(gAutoGenHPrologueString.Replace({'File':'AUTOGENH','Guid':Info.Guid.replace('-','_')}))
+    AutoGenH.Append(gAutoGenHCppPrologueString)
     if Info.AutoGenVersion >= 0x00010005:
         # header files includes
         AutoGenH.Append("#include <%s>\n" % gBasicHeaderFile)
@@ -2042,7 +2046,6 @@
         StringH.Append(gAutoGenHeaderString.Replace({'FileName':FileName}))
         StringH.Append(gAutoGenHPrologueString.Replace({'File':'STRDEFS', 'Guid':Info.Guid.replace('-','_')}))
         CreateUnicodeStringCode(Info, AutoGenC, StringH, UniGenCFlag, UniGenBinBuffer)
-        StringH.Append("\n#ifdef __cplusplus\n}\n#endif\n")
         StringH.Append("\n#endif\n")
         AutoGenH.Append('#include "%s"\n' % FileName)
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.