Bug 2398 - xrx compile error on AIX (X11R6.8.2 RC3)
Summary: xrx compile error on AIX (X11R6.8.2 RC3)
Status: RESOLVED FIXED
Alias: None
Product: xorg
Classification: Unclassified
Component: App/other (show other bugs)
Version: 6.8.2
Hardware: Other AIX
: high normal
Assignee: Roland Mainz
QA Contact:
URL:
Whiteboard:
Keywords:
: 2399 (view as bug list)
Depends on:
Blocks: 2386
  Show dependency treegraph
 
Reported: 2005-01-27 13:18 UTC by Dan McNichol
Modified: 2005-01-26 21:51 UTC (History)
1 user (show)

See Also:
i915 platform:
i915 features:


Attachments
Patch for 2005-01-27-trunk (2.85 KB, patch)
2005-01-27 16:47 UTC, Roland Mainz
no flags Details | Splinter Review

Description Dan McNichol 2005-01-27 13:18:40 UTC
The xrx plugin does not compile cleanly on AIX.
The file npapi.h tries to redefine a couple of sybols that are already
defined in a system header file.

Here is the error:
making all in programs/xrx/plugin...
Target "all" is up to date.








        rm -f Main.o
        xlc_r -c -O -D__STR31__ -DNDEBUG    -I. -I./include -I../rx   -
I../../.. -I../../../exports/include   -DSYSV -DAIXV3 -DAIXV4 -DAIXV5 -
D_ALL_SOURCE  -DFUNCPROTO=15   -DNETSCAPE_PLUGIN -DXP_UNIX  -
DBSD44SOCKETS     -DSHAREDCODE -bM\:SRE Main.c
"./include/npapi.h", line 44.15: 1506-334 (S) Identifier int16 has already 
been defined on line 619 of "/usr/include/sys/inttypes.h".
"./include/npapi.h", line 47.13: 1506-334 (S) Identifier int32 has already 
been defined on line 620 of "/usr/include/sys/inttypes.h".
make: The error code from the last command is 1.


Stop.
make: The error code from the last command is 2.


Stop.




Here is a quick patch I put together:
*** xc/programs/xrx/plugin/include/npapi.h.orig Fri Apr 23 14:55:03 2004
--- xc/programs/xrx/plugin/include/npapi.h      Thu Jan 27 13:42:54 2005
***************
*** 40,50 ****
--- 40,53 ----
  #ifndef _UINT32
  typedef unsigned int uint32;
  #endif
+ 
+ #if !(defined(_AIX) && defined(_H_INTTYPES) && defined(_ALL_SOURCE))
  #ifndef _INT16
  typedef short int16;
  #endif
  #ifndef _INT32
  typedef int int32;
+ #endif
  #endif
  
  #ifndef FALSE
Comment 1 Roland Mainz 2005-01-27 13:26:51 UTC
Taking bug myself...
Comment 2 Roland Mainz 2005-01-27 14:28:37 UTC
*** Bug 2399 has been marked as a duplicate of this bug. ***
Comment 3 Roland Mainz 2005-01-27 16:47:10 UTC
Created attachment 1765 [details] [review]
Patch for 2005-01-27-trunk
Comment 4 Roland Mainz 2005-01-27 16:50:56 UTC
Patch checked-in into Xorg-trunk...

/cvs/xorg/xc/ChangeLog,v  <--  ChangeLog
new revision: 1.717; previous revision: 1.716
/cvs/xorg/xc/programs/xrx/plugin/include/npapi.h,v  <--  npapi.h
new revision: 1.3; previous revision: 1.2
Mailing the commit message to xorg-commit@lists.freedesktop.org...

... marking bug as FIXED.

I'll fix this bug for the X11R6.8.x stable branch via syncing the branch xrx
sources with trunk to get the build bustage fixes for *BSD/MacOSX in, too.
Comment 5 Roland Mainz 2005-01-27 16:51:31 UTC
Dan:
BTW: Thanks for the patch! :)


Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.