diff options
| author | Pierre Ossman <ossman@cendio.se> | 2012-04-25 15:10:38 +0000 |
|---|---|---|
| committer | Pierre Ossman <ossman@cendio.se> | 2012-04-25 15:10:38 +0000 |
| commit | 33bead4a29a67d1d5ba0445647c330fd0bfae5eb (patch) | |
| tree | d95e95a56b1dc56181170193963e4783715cbe0b | |
| parent | ab8aeedefd03dcdef2e5f9f1aabc1bb9cd1d70f4 (diff) | |
| download | tigervnc-33bead4a29a67d1d5ba0445647c330fd0bfae5eb.tar.gz tigervnc-33bead4a29a67d1d5ba0445647c330fd0bfae5eb.zip | |
The reformatting of all the Xserver sources in the 1.12.1 release changed
the headers so now some of them have multiple instances of the C++ "and"
and "xor" keywords on the same line, so the hack to sanitize them needs
to use the sed "g" flag to replace all instances, not just the first.
Otherwise, the build fails with strange errors such as:
"fb.h", line 817: Error: Unexpected type name "FbBits" encountered.
"fb.h", line 817: Error: dst is not defined.
"fb.h", line 818: Error: Unexpected type name "FbStride" encountered.
"fb.h", line 818: Error: dstStride is not defined.
"fb.h", line 819: Error: Badly formed expression.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4899 3789f03b-4d11-0410-bbf8-ca57d06f2519
| -rw-r--r-- | unix/xserver/hw/vnc/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/unix/xserver/hw/vnc/Makefile.am b/unix/xserver/hw/vnc/Makefile.am index 2f58b4ca..5166ef29 100644 --- a/unix/xserver/hw/vnc/Makefile.am +++ b/unix/xserver/hw/vnc/Makefile.am @@ -63,7 +63,7 @@ EXTRA_DIST = Xvnc.man BUILT_SOURCES = $(nodist_Xvnc_SOURCES) fb.h: $(top_srcdir)/fb/fb.h - cat $(top_srcdir)/fb/fb.h | sed -e 's,and,c_and,' -e 's,xor,c_xor,' > $(srcdir)/fb.h + cat $(top_srcdir)/fb/fb.h | sed -e 's,and,c_and,g' -e 's,xor,c_xor,g' > $(srcdir)/fb.h pixman.h: for i in ${XSERVERLIBS_CFLAGS}; do \ @@ -78,4 +78,4 @@ pixman.h: fi fbrop.h: $(top_srcdir)/fb/fbrop.h - cat $(top_srcdir)/fb/fbrop.h | sed -e 's,and,c_and,' -e 's,xor,c_xor,' > $(srcdir)/fbrop.h + cat $(top_srcdir)/fb/fbrop.h | sed -e 's,and,c_and,g' -e 's,xor,c_xor,g' > $(srcdir)/fbrop.h |