lilo-gfxmenu/lilo-22.7-sa.diff

   1 --- lilo-22.7/crt.S
   2 +++ lilo-22.7/crt.S
   3 @@ -689,9 +689,9 @@
   4         .ascii  "LILO"
   5  #ifdef LCF_VERSION
   6         .ascii  " "
   7 -       .ascii  S(VERSION_MAJOR)
   8 +       .ascii  SA(VERSION_MAJOR)
   9         .ascii  "."
  10 -       .ascii  S(VERSION_MINOR)
  11 +       .ascii  SA(VERSION_MINOR)
  12         .ascii  VERSION_EDIT
  13  #endif
  14         .ascii  "  Boot Menu"
  15 --- lilo-22.7/lilo.c
  16 +++ lilo-22.7/lilo.c
  17 @@ -214,7 +214,7 @@
  18  #if __MSDOS__
  19             printf("%s\n", name
  20  #else /* !__MSDOS__ */
  21 -           fprintf(stdout,"%s%-" S(MAX_IMAGE_NAME) "s %s%s",verbose > 0 ? "  " : "",name,
  22 +           fprintf(stdout,"%s%-" SA(MAX_IMAGE_NAME) "s %s%s",verbose > 0 ? "  " : "",name,
  23               image ? "" : "*",
  24  #ifdef LCF_VIRTUAL
  25               descrs.d.descr[image].flags & FLAG_VMDEFAULT ? "@" :
  26 --- lilo-22.7/lilo.h
  27 +++ lilo-22.7/lilo.h
  28 @@ -70,7 +70,7 @@
  29
  30  #define nelem(a) (sizeof(a)/sizeof((a)[0]))
  31  #define S2(x) #x
  32 -#define S(x) S2(x)
  33 +#define SA(x) S2(x)
  34
  35  #include "version.h"
  36  #define VERSION 256*VERSION_MINOR+VERSION_MAJOR
  37 --- lilo-22.7/probe.c
  38 +++ lilo-22.7/probe.c
  39 @@ -264,7 +264,7 @@
  40                 needed==4 ? "22.0" :
  41                 needed==5 ? "22.5.1" :
  42                 needed==6 ? "22.5.7" :
  43 -               S(VERSION_MAJOR) "." S(VERSION_MINOR) VERSION_EDIT  );
  44 +               SA(VERSION_MAJOR) "." SA(VERSION_MINOR) VERSION_EDIT  );
  45         return 1;
  46      }
  47      return 0;
  48 --- lilo-22.7/second.S
  49 +++ lilo-22.7/second.S
  50 @@ -3922,9 +3922,9 @@
  51  #endif
  52  #ifdef LCF_VERSION
  53         .ascii  " "
  54 -       .ascii  S(VERSION_MAJOR)
  55 +       .ascii  SA(VERSION_MAJOR)
  56         .ascii  "."
  57 -       .ascii  S(VERSION_MINOR)
  58 +       .ascii  SA(VERSION_MINOR)
  59         .ascii  VERSION_EDIT
  60  #endif
  61         .byte   32,0