Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

renamed global variable to avoid conflict with export from Mac OS X framework

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11931 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Gilles Depeyrot
2001-10-10 21:55:40 +00:00
parent 683dccdaeb
commit ad781c239e
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
utils/tex2rtf/src/tex2rtf.cpp
View File

@@ -119,7 +119,7 @@ char *ContentsName = NULL; // Contents page from last time around
char *TmpContentsName = NULL; // Current contents page char *TmpContentsName = NULL; // Current contents page
char *TmpFrameContentsName = NULL; // Current frame contents page char *TmpFrameContentsName = NULL; // Current frame contents page
char *WinHelpContentsFileName = NULL; // WinHelp .cnt file char *WinHelpContentsFileName = NULL; // WinHelp .cnt file
char *RefName = NULL; // Reference file name char *RefFileName = NULL; // Reference file name
char *RTFCharset = copystring("ansi"); char *RTFCharset = copystring("ansi");
@@ -161,7 +161,7 @@ bool MyApp::OnInit()
TmpContentsName = new char[300]; TmpContentsName = new char[300];
TmpFrameContentsName = new char[300]; TmpFrameContentsName = new char[300];
WinHelpContentsFileName = new char[300]; WinHelpContentsFileName = new char[300];
RefName = new char[300]; RefFileName = new char[300];
ColourTable.DeleteContents(TRUE); ColourTable.DeleteContents(TRUE);
@@ -530,10 +530,10 @@ int MyApp::OnExit()
delete WinHelpContentsFileName; delete WinHelpContentsFileName;
WinHelpContentsFileName = NULL; WinHelpContentsFileName = NULL;
} }
if (RefName) if (RefFileName)
{ {
delete RefName; delete RefFileName;
RefName = NULL; RefFileName = NULL;
} }
if (TopLevel) if (TopLevel)
{ {
@@ -954,7 +954,7 @@ bool Go(void)
sprintf(TmpContentsName, "%s.cn1", FileRoot); sprintf(TmpContentsName, "%s.cn1", FileRoot);
sprintf(TmpFrameContentsName, "%s.frc", FileRoot); sprintf(TmpFrameContentsName, "%s.frc", FileRoot);
sprintf(WinHelpContentsFileName, "%s.cnt", FileRoot); sprintf(WinHelpContentsFileName, "%s.cnt", FileRoot);
sprintf(RefName, "%s.ref", FileRoot); sprintf(RefFileName, "%s.ref", FileRoot);
TexPathList.EnsureFileAccessible(InputFile); TexPathList.EnsureFileAccessible(InputFile);
if (!bulletFile) if (!bulletFile)
@@ -967,8 +967,8 @@ bool Go(void)
} }
} }
if (wxFileExists(RefName)) if (wxFileExists(RefFileName))
ReadTexReferences(RefName); ReadTexReferences(RefFileName);
bool success = FALSE; bool success = FALSE;
@@ -1027,7 +1027,7 @@ bool Go(void)
if (success) if (success)
{ {
WriteTexReferences(RefName); WriteTexReferences(RefFileName);
TexCleanUp(); TexCleanUp();
startedSections = FALSE; startedSections = FALSE;