Re: VENDOR_RELEASE

[Marc Aurele La France <tsi@xxxxxxxxxxx>]

On Mon, 19 Feb 2007, Frank J. R. Hanstick wrote:

> 	Farther down in the build, the following error occurred:

> darwin.c: In function 'DarwinPrintBanner':
> darwin.c:149: error: 'VENDOR_RELEASE' undeclared (first use in this function)
> darwin.c:149: error: (Each undeclared identifier is reported only once
> darwin.c:149: error: for each function it appears in.)
> darwin.c: In function 'DarwinAddScreen':
> darwin.c:199: warning: target of assignment not really an lvalue; this will 
> be a hard error in the future
> darwin.c: In function 'DarwinMouseProc':
> darwin.c:368: warning: pointer targets in passing argument 2 of 
> 'InitPointerDeviceStruct' differ in signedness
> darwin.c: In function 'ddxProcessArgument':
> darwin.c:741: warning: assignment discards qualifiers from pointer target 
> type
> make[6]: *** [darwin.o] Error 1
> make[5]: *** [all] Error 1
> make[4]: *** [hw] Error 1
> make[3]: *** [all] Error 1
> make[2]: *** [all] Error 1
> make[1]: *** [World] Error 2
> make: *** [World] Error 2

> 	The last world.txt entry was:

> /usr/bin/cc -c -Os -Wall -Wpointer-arith -no-cpp-precomp 
> -UNEED_SCREEN_REGIONS     -I. -I../../../../programs/Xserver/mi 
> -I../../../../programs/Xserver/fb -I../../../../programs/Xserver/render 
> -I../../../../programs/Xserver/include -I../../../../programs/Xserver/os 
> -I../../../../programs/Xserver/miext/shadow 
> -I../../../../programs/Xserver/hw/xfree86 
> -I../../../../programs/Xserver/Xi  -I../../../../exports/include 
> -D__powerpc__ -D__DARWIN__                                 -DNO_ALLOCA 
> -DCSRG_BASED  -DSHAPE -DXINPUT -DXKB -DLBX -DXAPPGROUP 	-DXCSECURITY -DXSYNC 
> -DXF86BIGFONT 	 -DBIGREQS -DPANORAMIX -DRENDER -DRANDR 	-DRES 
> -DPIXPRIV 	  		      -DNDEBUG 
> -DAVOID_GLYPHBLT -DPIXPRIV -DSINGLEDEPTH 
> -DXFree86Server 				-DSMART_SCHEDULE 
> -DBUILDDEBUG 				-DX_BYTE_ORDER=X_BIG_ENDIAN 
> -DDARWIN_WITH_QUARTZ  -DOSNAME='" Darwin"' -DOSVENDOR='" Apple Computer, 
> Inc."'                      -DUSE_NEW_CLUT darwin.c

> 	The darwin.c code is as follows:

> ErrorF(" / X Window System\n");
> ErrorF("(protocol Version %d, revision %d, vendor release %d)\n",
>        X_PROTOCOL, X_PROTOCOL_REVISION, VENDOR_RELEASE );
> ErrorF("Release Date: %s\n", XF86_DATE);

> 	Where it this suppose to be defined?

Nowhere.  VENDOR_RELEASE and XORG_RELEASE were removed from the other 
servers some time ago, so this is just an oversight.

Please try the attached patch.

Thanks.

Marc.

+----------------------------------+----------------------------------+
|  Marc Aurele La France           |  work:   1-780-492-9310          |
|  Academic Information and        |  fax:    1-780-492-1729          |
|    Communications Technologies   |  email:  tsi@xxxxxxxxxxx         |
|  352 General Services Building   +----------------------------------+
|  University of Alberta           |                                  |
|  Edmonton, Alberta               |    Standard disclaimers apply    |
|  T6G 2H1                         |                                  |
|  CANADA                          |                                  |
+----------------------------------+----------------------------------+
XFree86 developer and VP.  ATI driver and X server internals.

diff -acNpRrZ -x CVS -x .cvsignore -x test cvs/xc/programs/Xserver/hw/darwin/darwin.c devel/xc/programs/Xserver/hw/darwin/darwin.c
*** cvs/xc/programs/Xserver/hw/darwin/darwin.c	Thu Jan 25 08:16:13 2007
--- devel/xc/programs/Xserver/hw/darwin/darwin.c	Wed Feb 21 09:20:47 2007
***************
*** 29,35 ****
   * holders shall not be used in advertising or otherwise to promote the sale,
   * use or other dealings in this Software without prior written authorization.
   */
! /* $XFree86: xc/programs/Xserver/hw/darwin/darwin.c,v 1.62 2007/01/23 18:02:57 tsi Exp $ */
  
  #include <X11/X.h>
  #include <X11/Xproto.h>
--- 29,35 ----
   * holders shall not be used in advertising or otherwise to promote the sale,
   * use or other dealings in this Software without prior written authorization.
   */
! /* $XFree86: xc/programs/Xserver/hw/darwin/darwin.c,v 1.62tsi Exp $ */
  
  #include <X11/X.h>
  #include <X11/Xproto.h>
*************** DarwinPrintBanner()
*** 145,152 ****
    ErrorF(" (%s)", XF86_CUSTOM_VERSION);
  #endif
    ErrorF(" / X Window System\n");
!   ErrorF("(protocol Version %d, revision %d, vendor release %d)\n",
!          X_PROTOCOL, X_PROTOCOL_REVISION, VENDOR_RELEASE );
    ErrorF("Release Date: %s\n", XF86_DATE);
    ErrorF("\tIf the server is older than 6-12 months, or if your hardware is\n"
           "\tnewer than the above date, look for a newer version before\n"
--- 145,152 ----
    ErrorF(" (%s)", XF86_CUSTOM_VERSION);
  #endif
    ErrorF(" / X Window System\n");
!   ErrorF("(protocol Version %d, revision %d)\n",
!          X_PROTOCOL, X_PROTOCOL_REVISION);
    ErrorF("Release Date: %s\n", XF86_DATE);
    ErrorF("\tIf the server is older than 6-12 months, or if your hardware is\n"
           "\tnewer than the above date, look for a newer version before\n"