Changeset 865 in kBuild

Timestamp:

Mar 30, 2007 1:52:19 AM (18 years ago)

Author:

bird

Message:

win.amd64 fixes.

File:

• trunk/src/lib/kDep.c (modified) (4 diffs)

trunk/src/lib/kDep.c

@@ -99 +99 @@
             printf("my_assert: %s, file %s, line %d\npszPath=%s\npsz=%s\n", \
                    #expr, __FILE__, __LINE__, pszPath, psz); \
-            __asm { __asm int 3 } \
+            __debugbreak(); \
             exit(1); \
         } \
@@ -160 +160 @@
         char chSaved1;
         char *pszEnd;
-        int cch;
+        size_t cch;
         int iLongNameDiff;
 
@@ -185 +185 @@
         }
         pszEnd[0] = '\0';
-        while (   (iLongNameDiff = stricmp(FindFileData.cFileName, psz))
-               && stricmp(FindFileData.cAlternateFileName, psz))
+        while (   (iLongNameDiff = _stricmp(FindFileData.cFileName, psz))
+               && _stricmp(FindFileData.cAlternateFileName, psz))
         {
             if (!FindNextFile(hDir, &FindFileData))
@@ -200 +200 @@
         {
             /* replace spacy name with the short name. */
-            const int cchAlt = strlen(FindFileData.cAlternateFileName);
-            const int cchDelta = cch - cchAlt;
+            const size_t cchAlt = strlen(FindFileData.cAlternateFileName);
+            const size_t cchDelta = cch - cchAlt;
             my_assert(cchAlt > 0);
             if (!cchDelta)
                 memcpy(psz, FindFileData.cAlternateFileName, cch);
             else
-            {   int cbLeft = strlen(pszEnd) + 1;
+            {   
+                size_t cbLeft = strlen(pszEnd) + 1;
                 if ((psz - pszPath) + cbLeft + cchAlt <= _MAX_PATH)
                 {