Ignore:
Timestamp:
Jun 17, 2012, 10:45:31 PM (13 years ago)
Author:
bird
Message:

kmk: Merged in changes from GNU make 3.82. Previous GNU make base version was gnumake-2008-10-28-CVS.

Location:
trunk/src/kmk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/kmk

    • Property svn:ignore

      •  

        old new  
        1313stamp-*
        1414makebook*
         15
        1516.*gdbinit
         17.gdb_history
         18
        1619*.dep
        1720*.dvi
        … …  
        3134*.pg
        3235*.pgs
         36
        3337README
        3438README.DOS
        3539README.W32
         40README.OS2
        3641aclocal.m4
        3742autom4te.cache
        … …  
        5257config.h.W32
        5358config.h-vms
         59
        5460loadavg
        5561loadavg.c
        5662make
         63
        5764.deps
        5865.dep_segment
         66ID
         67TAGS
         68
        5969_*
        6070sun4
        … …  
        7282sol2
        7383i486-linux
         84
        7485customs
         86
        7587install-sh
        7688mkinstalldirs
         89
         90.directive.asc

  • trunk/src/kmk/vmsify.c

    r1993 r2591  
    11/* vmsify.c -- Module for vms <-> unix file name conversion
    22Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
    3 2007 Free Software Foundation, Inc.
     32007, 2008, 2009, 2010 Free Software Foundation, Inc.
    44This file is part of GNU Make.
    55
    … …  
    121121  char *s;
    122122
    123   INIT_DSC_CSTRING (name_dsc, name);
     123  /*
     124   * the string isn't changed, but there is no string descriptor with
     125   * "const char *dsc$a_pointer"
     126   */
     127  INIT_DSC_CSTRING (name_dsc, (char *)name);
    124128
    125129  stat = lib$sys_trnlog (&name_dsc, &resltlen, &reslt_dsc);
    … …  
    228232  int as_dir;
    229233  int count;
     234  const char *s;
     235  const char *s1;
     236  const char *s2;
    230237
    231238  if (name == 0)
    … …  
    240247  if (t != 0)
    241248    {
    242       const char *s1;
    243       const char *s2;
     249//      const char *s1;
     250//      const char *s2;
    244251
    245252      if (type == 1)
    … …  
    273280  if (t != 0)
    274281    {
    275       const char *s;
    276       const char *s1 = strchr (t+1, '[');
     282//      const char *s;
     283//      const char *s1 = strchr (t+1, '[');
     284      s1 = strchr (t+1, '[');
    277285      if (s1 == 0)
    278286        {
    … …  
    389397          case 3:                               /* '//' at start */
    390398            {
    391             const char *s;
    392             const char *s1;
     399//            const char *s;
     400//            const char *s1;
    393401            char *vp;
    394402            while (*fptr == '/')        /* collapse all '/' */
Note: See TracChangeset for help on using the changeset viewer.