WebSVN – Kolibri OS – Path Comparison – / – /programs/develop/cmm/ Rev 7544 and /programs/develop/cmm/ Rev 7545

Regard whitespace Rev 7544 → Rev 7545

 /programs/develop/cmm/main.cpp
 ,45 → 223,6
 void CheckUndefClassProc();
 /*
-PAVEL YAKOV
-char* strupr(char* s)
-{
-  char* p = s;
-  while (*p = toupper(*p)) p++;
-  return s;
-}
-char* strlwr(char* s)
-{
-  char* p = s;
-  while (*p = tolower(*p)) p++;
-  return s;
-}
-int strnicmp(const char* s1, const char* s2, int len)
-{
-  unsigned char c1,c2;
-  if(!len)
-        return 0;
-  do{
-    c1 = *s1++;
-    c2 = *s2++;
-    if (!c1||!c2)
-      break;
-    if (c1 == c2)
-      continue;
-    c1 = tolower(c1);
-    c2 = tolower(c2);
-    if (c1!=c2)
-      break;
-  } while (--len);
-  return (int)c1 - (int)c2;
-}
-*/
-/*
 void PrintTegList(structteg *tteg)
 {
         if(tteg){
 ,6 → 1136,9
 void *mem;
         mem=malloc(size);
         if(mem==NULL)OutMemory();
+#ifdef _UNIX_
+        else memset(mem,0,size);
+#endif
 //      if(((unsigned long)mem+size)>maxusedmem)maxusedmem=(unsigned long)mem+size;

 /programs/develop/cmm/port.h
 ,6 → 92,11
 #endif
+char* strupr(char* s);
+char* strlwr(char* s);
+int stricmp(const char*, const char*);
+int strnicmp(const char*, const char*, int);
 #ifdef _PORT_CPP_
 long lseek (int, long, int);
 ,12 → 103,6
 char tolower(char c);
 char toupper(char c);
-char* strupr(char* s);
-char* strlwr(char* s);
-int stricmp(const char*, const char*);
-int strnicmp(const char*, const char*, int);
 char * getcwd (char *buffer, int size);
 int     stat (const char*, struct _stat*);

/programs/develop/cmm/tokb.cpp


+

@@ -18274,7 +18280,7 @@




@@ -19494,8 +19500,14 @@



+

 /programs/develop/cmm/tokc.cpp
 ,6 → 178,9
         for(int i=0;i<=numfindpath;i++){
                 sprintf((char *)string2,"%s%s",findpath[(firstflag==0?i:numfindpath-i)],filename);
+#ifndef _WIN32_
+                for(char* p=(char *)string2; *p; ++p) if(*p=='\\') *p='/';
+#endif
                 if((hold=loadinputfile((char *)string2))!=-2)break;
                 if(firstflag==2||(firstflag==0&&(i+1)==numfindpath))break;
         }
 ,6 → 8603,9
                 stringexpected();
                 return(0);
         }
+#ifndef _WIN32_
+        for(char* p=(char *)string3; *p; ++p) if(*p=='\\') *p='/';
+#endif
         filehandle=open((char *)string3,O_BINARY|O_RDONLY);
         if(filehandle==-1){
                 unableopenfile((char *)string3);