6.2.033

   1 To: vim-dev@vim.org
   2 Subject: Patch 6.2.033 (extra)
   3 Fcc: outbox
   4 From: Bram Moolenaar <Bram@moolenaar.net>
   5 Mime-Version: 1.0
   6 Content-Type: text/plain; charset=ISO-8859-1
   7 Content-Transfer-Encoding: 8bit
   8 ------------
   9
  10 Patch 6.2.033 (extra)
  11 Problem:    Mac: Various compiler warnings.
  12 Solution:   Don't include Classic-only headers in Unix version.
  13             Remove references to several unused variables. (Ben Fowler)
  14             Use int instead of unsigned short for pixel values, so that the
  15             negative error values are recognized.
  16 Files:      src/gui_mac.c
  17
  18
  19 *** ../vim-6.2.032/src/gui_mac.c        Sat May 17 15:30:40 2003
  20 --- src/gui_mac.c       Fri Jul 25 22:21:05 2003
  21 ***************
  22 *** 93,100 ****
  23 --- 93,102 ----
  24   /* Include some file. TODO: move into os_mac.h */
  25   #include <Menus.h>
  26   #include <Resources.h>
  27 + #if !TARGET_API_MAC_CARBON
  28   #include <StandardFile.h>
  29   #include <Traps.h>
  30 + #endif
  31   #include <Balloons.h>
  32   #include <Processes.h>
  33   #ifdef USE_AEVENT
  34 ***************
  35 *** 3140,3147 ****
  36         {"Violet",      RGB(0x8D, 0x38, 0xC9)}, /*U*/
  37       };
  38
  39 !     unsigned short    r, g, b;
  40 !     int                       i;
  41
  42       if (name[0] == '#' && strlen((char *) name) == 7)
  43       {
  44 --- 3142,3149 ----
  45         {"Violet",      RGB(0x8D, 0x38, 0xC9)}, /*U*/
  46       };
  47
  48 !     int               r, g, b;
  49 !     int               i;
  50
  51       if (name[0] == '#' && strlen((char *) name) == 7)
  52       {
  53 ***************
  54 *** 5208,5231 ****
  55        * TODO: Add protection for 256 char max.
  56        */
  57
  58 !     CInfoPBRec  theCPB;
  59 !     Str255      directoryName;
  60 !     char_u      temporary[255];
  61 !  /* char      filename[255]; */
  62 !     char_u       fname[256];
  63 !     char_u    *temporaryPtr = temporary;
  64 !     char_u      *filenamePtr = fname;
  65 !     OSErr       error;
  66       int               folder = 1;
  67   #ifdef USE_UNIXFILENAME
  68 -     char      *p;
  69       SInt16    dfltVol_vRefNum;
  70 !     SInt32      dfltVol_dirID;
  71       FSRef     refFile;
  72       OSStatus  status;
  73       UInt32    pathSize = 256;
  74       char_u    pathname[256];
  75       char_u    *path = pathname;
  76   #endif
  77
  78   #ifdef USE_UNIXFILENAME
  79 --- 5210,5232 ----
  80        * TODO: Add protection for 256 char max.
  81        */
  82
  83 !     CInfoPBRec        theCPB;
  84 !     char_u    fname[256];
  85 !     char_u    *filenamePtr = fname;
  86 !     OSErr     error;
  87       int               folder = 1;
  88   #ifdef USE_UNIXFILENAME
  89       SInt16    dfltVol_vRefNum;
  90 !     SInt32    dfltVol_dirID;
  91       FSRef     refFile;
  92       OSStatus  status;
  93       UInt32    pathSize = 256;
  94       char_u    pathname[256];
  95       char_u    *path = pathname;
  96 + #else
  97 +     Str255    directoryName;
  98 +     char_u    temporary[255];
  99 +     char_u    *temporaryPtr = temporary;
 100   #endif
 101
 102   #ifdef USE_UNIXFILENAME
 103 ***************
 104 *** 5400,5408 ****
 105 --- 5401,5412 ----
 106       STRCPY(&temporaryPtr[1], filenamePtr);
 107       temporaryPtr[0] = '/';
 108       STRCPY(filenamePtr, temporaryPtr);
 109 +     {
 110 +     char      *p;
 111       for (p = fname; *p; p++)
 112         if (*p == ':')
 113             *p = '/';
 114 +     }
 115   #endif
 116
 117       return (vim_strsave (fname));
 118 *** ../vim-6.2.032/src/version.c        Fri Jul 25 21:39:40 2003
 119 --- src/version.c       Fri Jul 25 22:19:09 2003
 120 ***************
 121 *** 632,633 ****
 122 --- 632,635 ----
 123   {   /* Add new patch number below this line */
 124 + /**/
 125 +     33,
 126   /**/
 127
 128 --
 129 FIRST SOLDIER:  So they wouldn't be able to bring a coconut back anyway.
 130 SECOND SOLDIER: Wait a minute! Suppose two swallows carried it together?
 131 FIRST SOLDIER:  No, they'd have to have it on a line.
 132                  "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
 133
 134  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
 135 ///          Creator of Vim - Vi IMproved -- http://www.Vim.org          \\\
 136 \\\              Project leader for A-A-P -- http://www.A-A-P.org        ///
 137  \\\  Help AIDS victims, buy here: http://ICCF-Holland.org/click1.html  ///