Merge branch 'master' into feature/gnumake4

Conflicts:
	basebmp/prj/d.lst
	basebmp/test/basictest.cxx
	basebmp/test/makefile.mk
	basegfx/inc/basegfx/basegfxdllapi.h
	basegfx/inc/basegfx/tools/debugplotter.hxx
	basegfx/inc/basegfx/tuple/b2ituple.hxx
	basegfx/prj/d.lst
	basegfx/source/numeric/makefile.mk
	basegfx/source/polygon/makefile.mk
	basegfx/source/range/makefile.mk
	basegfx/source/raster/makefile.mk
	basegfx/source/tuple/makefile.mk
	basegfx/source/vector/makefile.mk
	basegfx/test/basegfx1d.cxx
	basegfx/test/makefile.mk
	basegfx/util/makefile.mk
	canvas/Library_canvasfactory.mk
	canvas/Module_canvas.mk
	canvas/prj/build.lst
	canvas/prj/d.lst
	canvas/source/cairo/cairo_canvashelper_texturefill.cxx
	canvas/source/cairo/makefile.mk
	canvas/source/tools/makefile.mk
	comphelper/qa/string/makefile.mk
	cppcanvas/Module_cppcanvas.mk
	cppcanvas/inc/cppcanvas/cppcanvasdllapi.h
	cppcanvas/prj/build.lst
	cppcanvas/prj/d.lst
	cppcanvas/source/mtfrenderer/makefile.mk
	cppcanvas/util/makefile.mk
	i18npool/source/search/makefile.mk
	regexp/Library_regexp.mk
	regexp/prj/d.lst
	sax/CppunitTest_sax.mk
	sax/Library_sax.mk
	sax/prj/d.lst
	sax/qa/cppunit/test_converter.cxx
	sax/source/expatwrap/attrlistimpl.hxx
	sax/util/makefile.mk
	svtools/Library_svt.mk
	tools/Executable_sspretty.mk
	ucbhelper/prj/d.lst
	ucbhelper/source/provider/configureucb.cxx
	ucbhelper/source/provider/provconf.cxx
	ucbhelper/util/makefile.mk
	unotools/Library_utl.mk
	unotools/Module_unotools.mk
	unotools/Package_inc.mk
	unotools/prj/build.lst
	vcl/Library_desktop_detector.mk
	vcl/Library_vcl.mk
	vcl/Library_vclplug_gtk.mk
	vcl/aqua/source/gdi/salprn.cxx
	vcl/inc/aqua/saldata.hxx
	vcl/unx/generic/gdi/salgdi3.cxx

1 files changed, 8 insertions, 9 deletions

diff --git a/rsc/source/rscpp/cpp5.c b/rsc/source/rscpp/cpp5.c
index 70f05543c465..4eb3183b5a86 100644
--- a/rsc/source/rscpp/cpp5.c
+++ b/rsc/source/rscpp/cpp5.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -113,7 +114,7 @@ register int    op;
 #define isbinary(op)    (op >= FIRST_BINOP && op <= LAST_BINOP)
 #define isunary(op) (op >= FIRST_UNOP  && op <= LAST_UNOP)
 #endif
-
+
 /*
  * The following definitions are used to specify basic variable sizes.
  */
@@ -157,7 +158,7 @@ register int    op;
 #ifndef S_PFPTR
 #define S_PFPTR     (sizeof (int (*)()))
 #endif
-
+
 typedef struct types {
     short   type;           /* This is the bit if       */
     char    *name;          /* this is the token word   */
@@ -202,7 +203,6 @@ SIZES size_table[] = {
     { T_FPTR,   0,      S_PFPTR     },  /* int (*())    */
     { 0,    0,      0       },  /* End of table */
 };
-
 
 void InitCpp5()
 {
@@ -235,9 +235,7 @@ eval()
     int     skip;       /* For short-circuit testing    */
     int     value[NEXP];    /* Value stack          */
     OPTAB       opstack[NEXP];  /* Operand stack        */
-#ifndef ZTC  /* BP */
     extern int  *evaleval();    /* Does actual evaluation   */
-#endif
     valp = value;
     opp = opstack;
     opp->op = OP_END;       /* Mark bottom of stack     */
@@ -380,7 +378,7 @@ again:  ;
         }                   /* op1 switch end   */
     }                   /* Stack unwind loop    */
 }
-
+
 FILE_LOCAL int
 evallex(int skip)
 /*
@@ -663,7 +661,7 @@ evalnum(int c)
     unget();
     return (value);
 }
-
+
 FILE_LOCAL int
 evalchar(int skip)
 /*
@@ -769,7 +767,7 @@ evalchar(int skip)
     instring = FALSE;
     return (value);
 }
-
+
 FILE_LOCAL int *
 evaleval(int* valp, int op, int skip)
 /*
@@ -907,7 +905,7 @@ evaleval(int* valp, int op, int skip)
     *valp++ = v1;
     return (valp);
 }
-
+
 #ifdef  DEBUG_EVAL
 dumpstack(opstack, opp, value, valp)
 OPTAB       opstack[NEXP];  /* Operand stack        */
@@ -927,3 +925,4 @@ register int    *valp;      /* -> value vector      */
 }
 #endif
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */