Created attachment 14743 [details]
bmpgui.cxx add `,'

Error message is following:

Making: ../unxfbsd.pro/obj/bmpgui.obj
ccache g++32 -w -c -I.  -I. -I../inc -I../inc -I../unx/inc -I../unxfbsd.pro/inc
-I. -I/work/ports/editors/openoffice-1.1-de
vel/work/oo_1.1.2_src/solver/645/unxfbsd.pro/inc/stl
-I/work/ports/editors/openoffice-1.1-devel/work/oo_1.1.2_src/solver/64
5/unxfbsd.pro/inc/external
-I/work/ports/editors/openoffice-1.1-devel/work/oo_1.1.2_src/solver/645/unxfbsd.pro/inc
-I/work/
ports/editors/openoffice-1.1-devel/work/oo_1.1.2_src/solenv/unxfbsd/inc
-I/work/ports/editors/openoffice-1.1-devel/work/oo_
1.1.2_src/solenv/inc
-I/work/ports/editors/openoffice-1.1-devel/work/oo_1.1.2_src/res
-I/work/ports/editors/openoffice-1.1-
devel/work/oo_1.1.2_src/solver/645/unxfbsd.pro/inc/stl
-I/work/ports/editors/openoffice-1.1-devel/work/oo_1.1.2_src/solenv/
inc/Xp31 -I/usr/local/jdk1.4.2/include -I/usr/local/jdk1.4.2/include/freebsd
-I/usr/local/jdk1.4.2/include/bsd -I/usr/local
/jdk1.4.2/include/native_threads/include -I/usr/X11R6/include     -I. -I../res
-I. -I/usr/X11R6/include -O   -pipe -fno-for
-scope -fpermissive -fno-rtti -fno-exceptions   -fPIC  -DFREEBSD -DUNX -DVCL
-DGCC -DC300 -DINTEL -DGXX_INCLUDE_PATH=/usr/l
ocal/lib/gcc-lib/i386-portbld-freebsd5.2.1/3.2.3/include/g++-v3 -DCVER=C300
-D_USE_NAMESPACE -D_USE_NAMESPACE=1 -DX86 -DNEW
_SOLAR -DSTLPORT_VERSION=450 -DOSVERSION=502010 -D_THREAD_SAFE -D_REENTRANT
-D__DMAKE -DUNIX -DCPPU_ENV=gcc3 -DSUPD=645 -DP
RODUCT -DNDEBUG -DPRODUCT_FULL -DOSL_DEBUG_LEVEL=0 -DOPTIMIZE -DEXCEPTIONS_OFF
-DCUI -DSOLAR_JAVA -DSRX645  -DMULTITHREAD  
-w -o ../unxfbsd.pro/obj/bmpgui.o
/work/ports/editors/openoffice-1.1-devel/work/oo_1.1.2_src/svtools/bmpmaker/bmpgui.cxx
/work/ports/editors/openoffice-1.1-devel/work/oo_1.1.2_src/svtools/bmpmaker/bmpgui.cxx:118:
syntax
   error before `{' token
/work/ports/editors/openoffice-1.1-devel/work/oo_1.1.2_src/svtools/bmpmaker/bmpgui.cxx:119:
syntax
   error before `{' token
dmake:  Error code 1, while making '../unxfbsd.pro/obj/bmpgui.obj'
---* TG_SLO.MK *---

ERROR: Error 65280 occurred while making
/work/ports/editors/openoffice-1.1-devel/work/oo_1.1.2_src/svtools/bmpmaker
dmake:  Error code 1, while making 'build_all'
---* TG_SLO.MK *---

seems to be a miss when merging:
http://ooo.ximian.com/bonsai/cvsview2.cgi?diff_mode=context&whitespace_mode=show&root=/var/cvsup&subdir=util/svtools/bmpmaker&command=DIFF_FRAMESET&root=/var/cvsup&file=bmpgui.cxx&rev1=1.5.116.1.26.2&rev2=1.5.116.1.26.3
Add Cc: svesik

correct target milestone

reassign to svesik

*** Issue 28336 has been marked as a duplicate of this issue. ***

Technically speaking, 28375 is duplicate of this, but I did it otherwise.

Sander - Volker committed the fix to fix1, so please take care about it. I think
it can cause problems when merging.


*** This issue has been marked as a duplicate of 28357 ***

Oops, I have to apologize!

First for not checking if there already was an issue.

And second for committing the fix. I thought noone was working on the
merge on the weekend. ( I'm obviously wrong, Sander is always working
and there might also be a script doing its job. )

Its ok, don't worry. As a matter of fact, I haven't done really almost anything
over the weekend, inc being able to read up on mail. 

vq: no problem

closing