gEDA-cvs: CVS update: mk_verilog_syms.c

[cvspsrv@xxxxxxxx]

  User: danmc   
  Date: 06/12/21 21:50:24

  Modified:    .        mk_verilog_syms.c
  Log:
  add an autoconf check for __func__ since that is C99 and __FUNCTION__
  
  is not.  If __func__ is not found, try __FUNCTION__ and then just
  
  skip using it.
  
  
  
  
  Revision  Changes    Path
  1.7       +17 -24    eda/geda/gaf/gnetlist/utils/mk_verilog_syms.c
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: mk_verilog_syms.c
  ===================================================================
  RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/gnetlist/utils/mk_verilog_syms.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- mk_verilog_syms.c	4 Dec 2006 22:10:08 -0000	1.6
  +++ mk_verilog_syms.c	22 Dec 2006 02:50:24 -0000	1.7
  @@ -46,13 +46,6 @@
   #define CYAN		6
   #define GREY		7
   
  -/* __FUNCTION__ seems to be a gcc extension */
  -#ifndef __GNUC__
  -#define __FUNCTION1(a,b) a ":" #b
  -#define __FUNCTION2(a,b) __FUNCTION1(a,b)
  -#define __FUNCTION__ __FUNCTION2(__FILE__,__LINE__)
  -#endif
  -
   /* external prototypes */
   int GetStringDisplayLength(char *str,int font_size);  /* char_width.c */
   
  @@ -121,7 +114,7 @@
   	if(fp == NULL)
   	  {
   	    fprintf(stderr,"Error: Unable to create file `%s' in %s()\n",
  -		    name, __FUNCTION__);
  +		    name, __func__);
   	    return 1;
   	  }
   
  @@ -131,7 +124,7 @@
   	if(rc)
   	  {
   	    fprintf(stderr,"Error: Symbol creation failed in %s()\n",
  -		    __FUNCTION__);
  +		    __func__);
   	    return 1;
   	  }
   
  @@ -172,7 +165,7 @@
     if(fp == NULL)
       {
         fprintf(stderr, "Error: NULL file pointer passed to %s()\n",
  -	      __FUNCTION__);
  +	      __func__);
         return 1;
       }
   
  @@ -180,7 +173,7 @@
       {
         fprintf(stderr, "Error: NULL body drawing function pointer passed "
   	      "to %s()\n",
  -	      __FUNCTION__);
  +	      __func__);
         return 1;
       }
   
  @@ -211,7 +204,7 @@
     if(rc)
       {
         fprintf(stderr, "Error: Body function failed in %s()\n",
  -	      __FUNCTION__);
  +	      __func__);
         return 1;
       }
   
  @@ -221,7 +214,7 @@
       {
         fprintf(stderr, "Error: Pin drawing function failed in %s() "
   	      "for output pin\n",
  -	      __FUNCTION__);
  +	      __func__);
         return 1;
       }
     /* attach pin attribute */
  @@ -229,7 +222,7 @@
     if(rc)
       {
         fprintf(stderr, "Error: Pin Attribute function failed for output pin "
  -	      "in %s()\n",__FUNCTION__);
  +	      "in %s()\n",__func__);
         return 1;
       }
   
  @@ -245,7 +238,7 @@
   	{
   	  fprintf(stderr,"Error: Pin drawing function failed for pin %u "
   		  "in %s()\n",
  -		  i, __FUNCTION__);
  +		  i, __func__);
   	  return 1;
   	}
         /* output the attributes */
  @@ -254,7 +247,7 @@
         if(rc)
   	{
   	  fprintf(stderr,"Error: Pin Attributes function failed for pin %u "
  -		  "in %s()\n", i, __FUNCTION__);
  +		  "in %s()\n", i, __func__);
   	  return 1;
   	}
   
  @@ -283,7 +276,7 @@
     if(fp == NULL)
       {
         fprintf(stderr, "Error: NULL file pointer passed to %s()\n",
  -	      __FUNCTION__);
  +	      __func__);
         return 1;
       }
   
  @@ -312,7 +305,7 @@
     if(fp == NULL)
       {
         fprintf(stderr, "Error: NULL file pointer passed to %s()\n",
  -	      __FUNCTION__);
  +	      __func__);
         return 1;
       }
   
  @@ -343,7 +336,7 @@
     if(fp == NULL)
       {
         fprintf(stderr, "Error: NULL file pointer passed to %s()\n",
  -	      __FUNCTION__);
  +	      __func__);
         return 1;
       }
   
  @@ -382,7 +375,7 @@
     if(fp == NULL)
       {
         fprintf(stderr, "Error: NULL file pointer passed to %s()\n",
  -	      __FUNCTION__);
  +	      __func__);
         return 1;
       }
   
  @@ -422,7 +415,7 @@
     if(fp == NULL)
       {
         fprintf(stderr, "Error: NULL file pointer passed to %s()\n",
  -	      __FUNCTION__);
  +	      __func__);
         return 1;
       }
   
  @@ -437,7 +430,7 @@
         if(denom < 1e-6)
   	{
   	  fprintf(stderr, "Error: Length of pin too small in %s()\n",
  -		  __FUNCTION__);
  +		  __func__);
   	  return 1;
   	}
         
  @@ -482,14 +475,14 @@
     if(fp == NULL)
       {
         fprintf(stderr, "Error: NULL file pointer passed to %s()\n",
  -	      __FUNCTION__);
  +	      __func__);
         return 1;
       }
     
     if(value == NULL)
       {
         fprintf(stderr, "Error: NULL value pointer passed to %s()\n",
  -	      __FUNCTION__);
  +	      __func__);
         return 1;
       }
   
  
  
  


_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs