Fossil

Check-in [fade0558]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Fix harmless compiler warning.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:fade0558f3a1b8308709c12fa156663ae1ac5cd6
User & Date: mistachkin 2014-02-28 17:42:37
Context
2014-02-28
17:42
Refresh the generated makefiles. check-in: 9b3aa6e9 user: mistachkin tags: trunk
17:42
Fix harmless compiler warning. check-in: fade0558 user: mistachkin tags: trunk
15:46
Fix to check-in [81162e791f] so that it does not require non-standard modifications to the SQLite "shell.c" source file.

Sorry, but this doesn't work! Compiling this with Makefile.mingw.mistachkin gives:

wbld/shell.o:shell.c:(.text+0x3463): undefined reference to `__imp_win32_access' wbld/shell.o:shell.c:(.text+0x59ac): undefined reference to `__imp_win32_access' /usr/lib/gcc/x86_64-w64-mingw32/4.8.2/../../../../x86_64-w64-mingw32/bin/ld: wbld/shell.o: bad reloc address 0x0 in section `.data' collect2: error: ld returned 1 exit status win/Makefile.mingw.mistachkin:698: recipe for target 'fossil.exe' failed check-in: 99dca383 user: drh tags: trunk

Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/diffcmd.c.

48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
  char *z = 0;
  if( diffFlags & DIFF_BRIEF ){
    /* no-op */
  }else if( diffFlags & DIFF_SIDEBYSIDE ){
    int w = diff_width(diffFlags);
    int n1 = strlen(zLeft);
    int n2 = strlen(zRight);
    int x, x2;
    if( n1==n2 && fossil_strcmp(zLeft,zRight)==0 ){
      if( n1>w*2 ) n1 = w*2;
      x = w*2+17 - (n1+2);
      z = mprintf("%.*c %.*s %.*c\n",
                 x/2, '=', n1, zLeft, (x+1)/2, '=');
    }else{
      if( w<20 ) w = 20;







|







48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
  char *z = 0;
  if( diffFlags & DIFF_BRIEF ){
    /* no-op */
  }else if( diffFlags & DIFF_SIDEBYSIDE ){
    int w = diff_width(diffFlags);
    int n1 = strlen(zLeft);
    int n2 = strlen(zRight);
    int x;
    if( n1==n2 && fossil_strcmp(zLeft,zRight)==0 ){
      if( n1>w*2 ) n1 = w*2;
      x = w*2+17 - (n1+2);
      z = mprintf("%.*c %.*s %.*c\n",
                 x/2, '=', n1, zLeft, (x+1)/2, '=');
    }else{
      if( w<20 ) w = 20;