mcpp/trunk/fs28284.patch

   1 diff -c -r -N ../mcpp-2.7.2/src/internal.H ./src/internal.H
   2 *** ../mcpp-2.7.2/src/internal.H        2008-08-27 10:31:16.000000000 -0230
   3 --- ./src/internal.H    2009-12-17 21:01:35.000000000 -0330
   4 ***************
   5 *** 390,395 ****
   6 --- 390,397 ----
   7   extern char     identifier[];       /* Lastly scanned name          */
   8   extern IFINFO   ifstack[];          /* Information of #if nesting   */
   9   extern char     work_buf[];
  10 + extern FILEINFO * sh_file;
  11 + extern int      sh_line;
  12           /* Temporary buffer for directive line and macro expansion  */
  13
  14   /* main.c   */
  15 ***************
  16 *** 557,562 ****
  17   #endif
  18   #endif
  19
  20 ! #if HOST_HAVE_STPCPY
  21   extern char *   stpcpy( char * dest, const char * src);
  22   #endif
  23 --- 559,564 ----
  24   #endif
  25   #endif
  26
  27 ! #if HOST_HAVE_STPCPY && !defined(stpcpy)
  28   extern char *   stpcpy( char * dest, const char * src);
  29   #endif
  30 diff -c -r -N ../mcpp-2.7.2/src/main.c ./src/main.c
  31 *** ../mcpp-2.7.2/src/main.c    2008-11-05 05:04:46.000000000 -0330
  32 --- ./src/main.c        2009-12-17 20:42:42.000000000 -0330
  33 ***************
  34 *** 326,331 ****
  35 --- 326,333 ----
  36               = FALSE;
  37       option_flags.trig = TRIGRAPHS_INIT;
  38       option_flags.dig = DIGRAPHS_INIT;
  39 +     sh_file = NULL;
  40 +     sh_line = 0;
  41   }
  42
  43   int     mcpp_lib_main
  44 diff -c -r -N ../mcpp-2.7.2/src/support.c ./src/support.c
  45 *** ../mcpp-2.7.2/src/support.c 2008-06-10 06:02:33.000000000 -0230
  46 --- ./src/support.c     2009-12-17 20:42:39.000000000 -0330
  47 ***************
  48 *** 188,194 ****
  49       size_t      length
  50   )
  51   {
  52 !     if (mem_buf_p->bytes_avail < length) {  /* Need to allocate more memory */
  53           size_t size = MAX( BUF_INCR_SIZE, length);
  54
  55           if (mem_buf_p->buffer == NULL) {            /* 1st append   */
  56 --- 188,194 ----
  57       size_t      length
  58   )
  59   {
  60 !     if (mem_buf_p->bytes_avail < length + 1) {  /* Need to allocate more memory */
  61           size_t size = MAX( BUF_INCR_SIZE, length);
  62
  63           if (mem_buf_p->buffer == NULL) {            /* 1st append   */
  64 ***************
  65 *** 1722,1727 ****
  66 --- 1722,1729 ----
  67                       sp -= 2;
  68                       while (*sp != '\n')     /* Until end of line    */
  69                           mcpp_fputc( *sp++, OUT);
  70 +                     mcpp_fputc( '\n', OUT);
  71 +                     wrong_line = TRUE;
  72                   }
  73                   goto  end_line;
  74               default:                        /* Not a comment        */
  75 diff -c -r -N ../mcpp-2.7.2/src/system.c ./src/system.c
  76 *** ../mcpp-2.7.2/src/system.c  2008-11-26 06:23:51.000000000 -0330
  77 --- ./src/system.c      2009-12-17 20:42:42.000000000 -0330
  78 ***************
  79 *** 3858,3863 ****
  80 --- 3858,3866 ----
  81   }
  82   #endif
  83
  84 + FILEINFO*       sh_file;
  85 + int             sh_line;
  86 +
  87   void    sharp(
  88       FILEINFO *  sharp_file,
  89       int         flag        /* Flag to append to the line for GCC   */
  90 ***************
  91 *** 3868,3875 ****
  92    * else (i.e. 'sharp_file' is NULL) 'infile'.
  93    */
  94   {
  95 -     static FILEINFO *   sh_file;
  96 -     static int  sh_line;
  97       FILEINFO *  file;
  98       int         line;
  99
 100 --- 3871,3876 ----