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

fixed broken compilation under Linux,

Browse Source 
ULONG undefined and a duplicated global var name.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7162 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ron Lee
2000-04-14 16:02:23 +00:00
parent b820f3ab56
commit 49f74d51eb
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/tex2any.cpp
View File

@@ -363,9 +363,9 @@ bool FindEndEnvironment(char *buffer, int *pos, char *env)
bool readingVerbatim = FALSE; bool readingVerbatim = FALSE;
bool readInVerbatim = FALSE; // Within a verbatim, but not nec. verbatiminput bool readInVerbatim = FALSE; // Within a verbatim, but not nec. verbatiminput
ULONG leftCurly = 0; unsigned long leftCurly = 0;
ULONG rightCurly = 0; unsigned long rightCurly = 0;
wxString currentFileName = ""; wxString currentFile = "";
bool read_a_line(char *buf) bool read_a_line(char *buf)
{ {
@@ -394,7 +394,7 @@ bool read_a_line(char *buf)
if (rightCurly > leftCurly) if (rightCurly > leftCurly)
{ {
wxString errBuf; wxString errBuf;
errBuf.Printf("An extra right Curly brace ('}') was detected at line %lu inside file %s",LineNumbers[CurrentInputIndex], (const char*) currentFileName.c_str()); errBuf.Printf("An extra right Curly brace ('}') was detected at line %lu inside file %s",LineNumbers[CurrentInputIndex], (const char*) currentFile.c_str());
OnError((char *)errBuf.c_str()); OnError((char *)errBuf.c_str());
// Reduce the count of right curly braces, so the mismatched count // Reduce the count of right curly braces, so the mismatched count
@@ -478,7 +478,7 @@ bool read_a_line(char *buf)
if (leftCurly != rightCurly) if (leftCurly != rightCurly)
{ {
wxString errBuf; wxString errBuf;
errBuf.Printf("Curly braces do not match inside file %s\n%lu opens, %lu closes", (const char*) currentFileName.c_str(),leftCurly,rightCurly); errBuf.Printf("Curly braces do not match inside file %s\n%lu opens, %lu closes", (const char*) currentFile.c_str(),leftCurly,rightCurly);
OnError((char *)errBuf.c_str()); OnError((char *)errBuf.c_str());
} }
leftCurly = 0; leftCurly = 0;
@@ -523,7 +523,7 @@ bool read_a_line(char *buf)
if (buf[j-1] == '}') buf[j-1] = 0; // Ignore final brace if (buf[j-1] == '}') buf[j-1] = 0; // Ignore final brace
wxString actualFile = TexPathList.FindValidPath(fileName); wxString actualFile = TexPathList.FindValidPath(fileName);
currentFileName = actualFile; currentFile = actualFile;
if (actualFile == "") if (actualFile == "")
{ {
char errBuf[300]; char errBuf[300];
@@ -588,7 +588,7 @@ bool read_a_line(char *buf)
// Ignore some types of input files (e.g. macro definition files) // Ignore some types of input files (e.g. macro definition files)
char *fileOnly = FileNameFromPath(fileName); char *fileOnly = FileNameFromPath(fileName);
currentFileName = fileOnly; currentFile = fileOnly;
if (IgnorableInputFiles.Member(fileOnly)) if (IgnorableInputFiles.Member(fileOnly))
return read_a_line(buf); return read_a_line(buf);
@@ -599,7 +599,7 @@ bool read_a_line(char *buf)
sprintf(buf2, "%s.tex", fileName); sprintf(buf2, "%s.tex", fileName);
actualFile = TexPathList.FindValidPath(buf2); actualFile = TexPathList.FindValidPath(buf2);
} }
currentFileName = actualFile; currentFile = actualFile;
if (actualFile == "") if (actualFile == "")
{ {
@@ -645,7 +645,7 @@ bool read_a_line(char *buf)
if (ch == EOF && leftCurly != rightCurly) if (ch == EOF && leftCurly != rightCurly)
{ {
wxString errBuf; wxString errBuf;
errBuf.Printf("Curly braces do not match inside file %s\n%lu opens, %lu closes", (const char*) currentFileName.c_str(),leftCurly,rightCurly); errBuf.Printf("Curly braces do not match inside file %s\n%lu opens, %lu closes", (const char*) currentFile.c_str(),leftCurly,rightCurly);
OnError((char *)errBuf.c_str()); OnError((char *)errBuf.c_str());
} }