X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=BaseTools%2FScripts%2FConvertFceToStructurePcd.py;h=59eec28d5e0010e467302accaa338d006e08c0fd;hb=591a44c02d92fcb9f1ec0950714d20c5da283d38;hp=9240b8f0f3ea4ebb613a7ac7d8373e4b3cc1fe38;hpb=ce283fd6098e46c9ae2c4c426315741aae3d5c96;p=mirror_edk2.git

diff --git a/BaseTools/Scripts/ConvertFceToStructurePcd.py b/BaseTools/Scripts/ConvertFceToStructurePcd.py
index 9240b8f0f3..59eec28d5e 100644
--- a/BaseTools/Scripts/ConvertFceToStructurePcd.py
+++ b/BaseTools/Scripts/ConvertFceToStructurePcd.py
@@ -416,7 +416,7 @@ class PATH(object):
 
   def header(self,struct):
     header={}
-    head_re = re.compile(r'} %s;[\s\S\n]+h{1}"'%struct,re.M|re.S)
+    head_re = re.compile('typedef.*} %s;[\n]+(.*?)(?:typedef|formset)'%struct,re.M|re.S)
     head_re2 = re.compile(r'#line[\s\d]+"(\S+h)"')
     for i in list(self.lstinf.keys()):
       with open(i,'r') as lst: