stlport/STLport-4.5.patch

   1 --- misc/STLport-4.5/src/common_macros_os2.mak  2008-07-18 14:14:27.000000000 +0200
   2 +++ misc/build/STLport-4.5/src/common_macros_os2.mak    2008-07-18 14:14:05.000000000 +0200
   3 @@ -1 +1,37 @@
   4 -dummy
   5 +SHELL=/bin/sh
   6 +
   7 +# INSTALLDIR=/usr/local
   8 +# INSTALLDIR_INC=$(INSTALLDIR)/include/stlport
   9 +# INSTALLDIR_LIB=$(INSTALLDIR)/lib
  10 +
  11 +# RM = rm -fr
  12 +
  13 +# INSTALL = ./install.sh -c
  14 +# INSTALL_LIB = $(INSTALL)
  15 +# INSTALL_H = $(INSTALL) -m 444
  16 +
  17 +#
  18 +#
  19 +# Targets
  20 +#
  21 +
  22 +VERSION_SUFFIX= $(VERSION_MAJOR)$(VERSION_MINOR)$(BETA_SUFFIX)
  23 +DYNAMIC_SUFFIX= $(VERSION_SUFFIX)$(PATCH_SUFFIX)
  24 +DYNAMIC_SUFFIX= $(VERSION_SUFFIX)$(PATCH_SUFFIX)
  25 +
  26 +# those are defined "Unix way" in common_macros.mak; redefine them here
  27 +RELEASE_DYNLIB=$(RELEASE_NAME)$(DYNAMIC_SUFFIX).$(DYNEXT)
  28 +DEBUG_DYNLIB=$(DEBUG_NAME)$(DYNAMIC_SUFFIX).$(DYNEXT)
  29 +STLDEBUG_DYNLIB=$(STLDEBUG_NAME)$(DYNAMIC_SUFFIX).$(DYNEXT)
  30 +
  31 +RELEASE_DYNLIB_SONAME=$(RELEASE_NAME)$(VERSION_SUFFIX).$(DYNEXT)
  32 +DEBUG_DYNLIB_SONAME=$(DEBUG_NAME)$(VERSION_SUFFIX).$(DYNEXT)
  33 +STLDEBUG_DYNLIB_SONAME=$(STLDEBUG_NAME)$(VERSION_SUFFIX).$(DYNEXT)
  34 +
  35 +ALL_DYNAMIC_LIBS=$(OUTDIR)$(PATH_SEP)$(RELEASE_DYNLIB) $(OUTDIR)$(PATH_SEP)$(STLDEBUG_DYNLIB)
  36 +ALL_DYNAMIC_LIBS=$(OUTDIR)$(PATH_SEP)$(RELEASE_DYNLIB)
  37 +DEBUG_DYNAMIC_LIBS=$(OUTDIR)$(PATH_SEP)$(RELEASE_DYNLIB) $(OUTDIR)$(PATH_SEP)$(STLDEBUG_DYNLIB)
  38 +
  39 +RELEASE_LIB=$(RELEASE_NAME)$(STATIC_SUFFIX).$(STEXT)
  40 +DEBUG_LIB=$(DEBUG_NAME)$(STATIC_SUFFIX).$(STEXT)
  41 +STLDEBUG_LIB=$(STLDEBUG_NAME)$(STATIC_SUFFIX).$(STEXT)
  42 --- misc/STLport-4.5/src/common_percent_rules.mak       2001-05-19 05:04:20.000000000 +0200
  43 +++ misc/build/STLport-4.5/src/common_percent_rules.mak 2008-07-18 14:13:49.000000000 +0200
  44 @@ -1,45 +1,52 @@
  45
  46  .SUFFIXES: .cpp .c .o .so .a
  47
  48 +CFLAGS_RELEASE_static*= $(CXXFLAGS_RELEASE_static)
  49 +CFLAGS_RELEASE_dynamic*= $(CXXFLAGS_RELEASE_dynamic)
  50 +CFLAGS_DEBUG_static*= $(CXXFLAGS_DEBUG_static)
  51 +CFLAGS_DEBUG_dynamic*= $(CXXFLAGS_DEBUG_dynamic)
  52 +CFLAGS_STLDEBUG_static*= $(CXXFLAGS_STLDEBUG_static)
  53 +CFLAGS_STLDEBUG_dynamic*= $(CXXFLAGS_STLDEBUG_dynamic)
  54 +
  55  $(RELEASE_OBJDIR_static)/%.o: %.cpp
  56         $(CXX) $(CXXFLAGS_RELEASE_static) $< -c -o $@
  57  $(RELEASE_OBJDIR_static)/%.o: %.c
  58 -       $(CC) $(CXXFLAGS_RELEASE_static) $< -c -o $@
  59 +       $(CC) $(CFLAGS_RELEASE_static) $< -c -o $@
  60  $(RELEASE_OBJDIR_static)/%.i : %.cpp
  61         $(CXX) $(CXXFLAGS_RELEASE_static) $< -E  $@
  62
  63  $(RELEASE_OBJDIR_dynamic)/%.o : %.cpp
  64         $(CXX) $(CXXFLAGS_RELEASE_dynamic) $< -c -o $@
  65  $(RELEASE_OBJDIR_dynamic)/%.o : %.c
  66 -       $(CC) $(CXXFLAGS_RELEASE_dynamic) $< -c -o $@
  67 +       $(CC) $(CFLAGS_RELEASE_dynamic) $< -c -o $@
  68  $(RELEASE_OBJDIR_dynamic)/%.i : %.cpp
  69         $(CXX) $(CXXFLAGS_RELEASE_dynamic) $< -E  $@
  70
  71  $(DEBUG_OBJDIR_static)/%.o : %.cpp
  72         $(CXX) $(CXXFLAGS_DEBUG_static) $< -c -o $@
  73  $(DEBUG_OBJDIR_static)/%.o : %.c
  74 -       $(CC) $(CXXFLAGS_DEBUG_static) $< -c -o $@
  75 +       $(CC) $(CFLAGS_DEBUG_static) $< -c -o $@
  76  $(DEBUG_OBJDIR_static)/%.i : %.cpp
  77         $(CXX) $(CXXFLAGS_DEBUG_static) $< -E  $@
  78
  79  $(DEBUG_OBJDIR_dynamic)/%.o : %.cpp
  80         $(CXX) $(CXXFLAGS_DEBUG_dynamic) $< -c -o $@
  81  $(DEBUG_OBJDIR_dynamic)/%.o : %.c
  82 -       $(CC) $(CXXFLAGS_DEBUG_dynamic) $< -c -o $@
  83 +       $(CC) $(CFLAGS_DEBUG_dynamic) $< -c -o $@
  84  $(DEBUG_OBJDIR_dynamic)/%.i : %.cpp
  85         $(CXX) $(CXXFLAGS_DEBUG_dynamic) $< -E  $@
  86
  87  $(STLDEBUG_OBJDIR_static)/%.o : %.cpp
  88         $(CXX) $(CXXFLAGS_STLDEBUG_static) $< -c -o $@
  89  $(STLDEBUG_OBJDIR_static)/%.o : %.c
  90 -       $(CC) $(CXXFLAGS_STLDEBUG_static) $< -c -o $@
  91 +       $(CC) $(CFLAGS_STLDEBUG_static) $< -c -o $@
  92  $(STLDEBUG_OBJDIR_static)/%.i : %.cpp
  93         $(CXX) $(CXXFLAGS_STLDEBUG_static) $< -E  $@
  94
  95  $(STLDEBUG_OBJDIR_dynamic)/%.o : %.cpp
  96         $(CXX) $(CXXFLAGS_STLDEBUG_dynamic) $< -c -o $@
  97  $(STLDEBUG_OBJDIR_dynamic)/%.o : %.c
  98 -       $(CC) $(CXXFLAGS_STLDEBUG_dynamic) $< -c -o $@
  99 +       $(CC) $(CFLAGS_STLDEBUG_dynamic) $< -c -o $@
 100  $(STLDEBUG_OBJDIR_dynamic)/%.i : %.cpp
 101         $(CXX) $(CXXFLAGS_STLDEBUG_dynamic) $< -E  $@
 102
 103 --- misc/STLport-4.5/src/dll_main.cpp   2001-08-25 03:14:19.000000000 +0200
 104 +++ misc/build/STLport-4.5/src/dll_main.cpp     2008-07-18 14:13:49.000000000 +0200
 105 @@ -147,6 +147,10 @@
 106  template struct _STLP_CLASS_DECLSPEC __stl_debug_engine<bool>;
 107  # endif
 108
 109 +#ifdef __APPLE__
 110 +template class _STLP_CLASS_DECLSPEC _Node_Alloc_Lock<false,0>;
 111 +template class _STLP_CLASS_DECLSPEC _Node_Alloc_Lock<true,0>;
 112 +#endif
 113  template class _STLP_CLASS_DECLSPEC __node_alloc<false,0>;
 114  template class _STLP_CLASS_DECLSPEC __node_alloc<true,0>;
 115  template class _STLP_CLASS_DECLSPEC __debug_alloc< __node_alloc<true,0> >;
 116 --- misc/STLport-4.5/src/gcc-3.0-freebsd.mak    2008-07-18 14:14:26.000000000 +0200
 117 +++ misc/build/STLport-4.5/src/gcc-3.0-freebsd.mak      2008-07-18 14:13:49.000000000 +0200
 118 @@ -1 +1,69 @@
 119 -dummy
 120 +#
 121 +# Note : this makefile is for gcc-3 !
 122 +#
 123 +
 124 +#
 125 +# compiler
 126 +# take these from the OOo build environment
 127 +CC*= gcc
 128 +CXX*= g++
 129 +
 130 +#
 131 +# Basename for libraries
 132 +#
 133 +LIB_BASENAME = libstlport_gcc
 134 +
 135 +#
 136 +# guts for common stuff
 137 +#
 138 +#
 139 +LINK=ar cr
 140 +DYN_LINK=${CXX} -Wl,-rpath,'$$ORIGIN' ${PTHREAD_LIBS} --fexceptions -shared -o
 141 +
 142 +OBJEXT=o
 143 +DYNEXT=so
 144 +STEXT=a
 145 +RM=rm -rf
 146 +PATH_SEP=/
 147 +MKDIR=mkdir -p
 148 +COMP=GCC$(ARCH)
 149 +INSTALL_STEP = install_unix
 150 +
 151 +all:  all_dynamic all_static symbolic_links
 152 +
 153 +include common_macros.mak
 154 +
 155 +WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized
 156 +
 157 +CXXFLAGS_COMMON = ${PTHREAD_CFLAGS} -DGXX_INCLUDE_PATH=${GXX_INCLUDE_PATH} -fexceptions -ftemplate-depth-32 -I${STLPORT_DIR} ${WARNING_FLAGS} ${ARCH_FLAGS}
 158 +CFLAGS_COMMON = ${PTHREAD_CFLAGS} -DGXX_INCLUDE_PATH=${GXX_INCLUDE_PATH} -fexceptions -I${STLPORT_DIR} ${WARNING_FLAGS} ${ARCH_FLAGS}
 159 +
 160 +CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2 -fPIC
 161 +CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 -fPIC
 162 +
 163 +CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g -fPIC
 164 +CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
 165 +
 166 +CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
 167 +CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
 168 +
 169 +CFLAGS_RELEASE_static = $(CFLAGS_COMMON) -O2 -fPIC
 170 +CFLAGS_RELEASE_dynamic = $(CFLAGS_COMMON) -O2 -fPIC
 171 +
 172 +CFLAGS_DEBUG_static = $(CFLAGS_COMMON) -g -fPIC
 173 +CFLAGS_DEBUG_dynamic = $(CFLAGS_COMMON) -g -fPIC
 174 +
 175 +CFLAGS_STLDEBUG_static = $(CFLAGS_DEBUG_static) -D_STLP_DEBUG
 176 +CFLAGS_STLDEBUG_dynamic = $(CFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
 177 +
 178 +include common_percent_rules.mak
 179 +include common_rules.mak
 180 +
 181 +
 182 +#install: all
 183 +#      cp -p $(LIB_TARGET) ${D_LIB_TARGET} ../lib
 184 +
 185 +#%.s: %.cpp
 186 +#      $(CXX) $(CXXFLAGS) -O4 -S -pto $<  -o $@
 187 +
 188 +
 189 --- misc/STLport-4.5/src/gcc-3.0-mingw.mak      2008-07-18 14:14:26.000000000 +0200
 190 +++ misc/build/STLport-4.5/src/gcc-3.0-mingw.mak        2008-07-18 14:13:49.000000000 +0200
 191 @@ -1 +1,108 @@
 192 -dummy
 193 +#
 194 +# Note : this makefile is for gcc-3 !
 195 +#
 196 +
 197 +#
 198 +# compiler
 199 +# take these from the OOo build environment
 200 +CC*= gcc
 201 +CXX*= g++
 202 +
 203 +#
 204 +# Basename for libraries
 205 +#
 206 +LIB_BASENAME = libstlport_gcc
 207 +
 208 +#
 209 +# guts for common stuff
 210 +#
 211 +#
 212 +LINK=ar crv
 213 +DYN_LINK=$(CXX) --fexceptions -shared -o
 214 +
 215 +OBJEXT=o
 216 +DYNEXT=dll
 217 +STEXT=a
 218 +RM=rm -rf
 219 +PATH_SEP=/
 220 +MKDIR=mkdir -p
 221 +COMP=MINGW32
 222 +STATIC_SUFFIX=_static
 223 +
 224 +
 225 +all:  all_dynamic debug_dynamic all_static debug_static
 226 +
 227 +include common_macros.mak
 228 +
 229 +# those are defined "Unix way" in common_macros.mak; redefine them here
 230 +RELEASE_DYNLIB=$(RELEASE_NAME).$(DYNEXT)
 231 +DEBUG_DYNLIB=$(DEBUG_NAME).$(DYNEXT)
 232 +STLDEBUG_DYNLIB=$(STLDEBUG_NAME).$(DYNEXT)
 233 +
 234 +RELEASE_DYNLIB_SONAME=$(RELEASE_DYNLIB)
 235 +DEBUG_DYNLIB_SONAME=$(DEBUG_DYNLIB)
 236 +STLDEBUG_DYNLIB_SONAME=$(STLDEBUG_DYNLIB)
 237 +
 238 +ALL_DYNAMIC_LIBS=$(OUTDIR)$(PATH_SEP)$(RELEASE_DYNLIB) $(OUTDIR)$(PATH_SEP)$(STLDEBUG_DYNLIB)
 239 +DEBUG_DYNAMIC_LIBS=$(OUTDIR)$(PATH_SEP)$(RELEASE_DYNLIB) $(OUTDIR)$(PATH_SEP)$(STLDEBUG_DYNLIB)
 240 +
 241 +RESFILE=$(RELEASE_OBJDIR_dynamic)$(PATH_SEP)stlport.o
 242 +RESFILE_debug=$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)stlport.o
 243 +RESFILE_stldebug=$(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)stlport.o
 244 +
 245 +WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized
 246 +
 247 +CXXFLAGS_COMMON =  -mthreads -fexceptions -ftemplate-depth-32 -I${STLPORT_DIR} -DGXX_INCLUDE_PATH=${GXX_INCLUDE_PATH} ${WARNING_FLAGS}
 248 +CFLAGS_COMMON =  -mthreads -fexceptions -I${STLPORT_DIR} -DGXX_INCLUDE_PATH=${GXX_INCLUDE_PATH} ${WARNING_FLAGS}
 249 +
 250 +LDFLAGS_COMMON_dynamic+= -enable-runtime-pseudo-reloc -Wl,--export-all-symbols -Wl,-d -mthreads
 251 +
 252 +CXXFLAGS_RELEASE_static =  $(CXXFLAGS_COMMON) -O2
 253 +CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -shared -O2 -D_DLL -D_STLP_USE_DYNAMIC_LIB -D_STLP_DLLEXPORT_NEEDS_PREDECLARATION
 254 +
 255 +CXXFLAGS_DEBUG_static =  $(CXXFLAGS_COMMON) -g
 256 +CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -shared -g -D_DLL -D_STLP_USE_DYNAMIC_LIB -D_STLP_DLLEXPORT_NEEDS_PREDECLARATION
 257 +
 258 +CXXFLAGS_STLDEBUG_static =  $(CXXFLAGS_DEBUG_static)  -D_STLP_DEBUG
 259 +CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
 260 +
 261 +CFLAGS_RELEASE_static =  $(CFLAGS_COMMON) -O2
 262 +CFLAGS_RELEASE_dynamic = $(CFLAGS_COMMON) -shared -O2 -D_DLL -D_STLP_USE_DYNAMIC_LIB -D_STLP_DLLEXPORT_NEEDS_PREDECLARATION
 263 +
 264 +CFLAGS_DEBUG_static =  $(CFLAGS_COMMON) -g
 265 +CFLAGS_DEBUG_dynamic = $(CFLAGS_COMMON) -shared -g -D_DLL -D_STLP_USE_DYNAMIC_LIB -D_STLP_DLLEXPORT_NEEDS_PREDECLARATION
 266 +
 267 +CFLAGS_STLDEBUG_static =  $(CFLAGS_DEBUG_static)  -D_STLP_DEBUG
 268 +CFLAGS_STLDEBUG_dynamic = $(CFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
 269 +
 270 +LDLIBS_RELEASE_dynamic = ${LDLIBS_COMMON_dynamic}
 271 +LDFLAGS_RELEASE_dynamic = ${CXXFLAGS_RELEASE_dynamic} ${LDFLAGS_COMMON_dynamic} -Wl,-Map,${OUTDIR}/${RELEASE_NAME}.map -Wl,--out-implib,${OUTDIR}/${RELEASE_NAME}.a
 272 +
 273 +LDLIBS_DEBUG_dynamic = ${LDLIBS_COMMON_dynamic}
 274 +LDFLAGS_DEBUG_dynamic = ${CXXFLAGS_DEBUG_dynamic} ${LDFLAGS_COMMON_dynamic} -Wl,-Map,${OUTDIR}/${DEBUG_NAME}.map -Wl,--out-implib,${OUTDIR}/${DEBUG_NAME}.a
 275 +
 276 +LDLIBS_STLDEBUG_dynamic = ${LDLIBS_COMMON_dynamic}
 277 +LDFLAGS_STLDEBUG_dynamic = ${CXXFLAGS_STLDEBUG_dynamic} ${LDFLAGS_COMMON_dynamic} -Wl,-Map,${OUTDIR}/${STLDEBUG_NAME}.map -Wl,--out-implib,${OUTDIR}/${STLDEBUG_NAME}.a
 278 +
 279 +
 280 +include common_percent_rules.mak
 281 +include common_rules.mak
 282 +
 283 +
 284 +
 285 +${RESFILE}: stlport.rc
 286 +       windres -O coff --define COMP=${COMP} --define BUILD= -o $(RELEASE_OBJDIR_dynamic)$(PATH_SEP)stlport.o stlport.rc
 287 +
 288 +${RESFILE_debug}: stlport.rc
 289 +       windres -O coff --define COMP=${COMP} --define BUILD=_DEBUG -o $(DEBUG_OBJDIR_dynamic)$(PATH_SEP)stlport.o stlport.rc
 290 +
 291 +${RESFILE_stldebug}: stlport.rc
 292 +       windres -O coff --define COMP=${COMP} --define BUILD=_STLDEBUG -o $(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)stlport.o stlport.rc
 293 +
 294 +#install: all
 295 +#      cp -p $(LIB_TARGET) ${D_LIB_TARGET} ../lib
 296 +
 297 +#%.s: %.cpp
 298 +#      $(CXX) $(CXXFLAGS) -O4 -S -pto $<  -o $@
 299 +
 300 +
 301 --- misc/STLport-4.5/src/gcc-3.0-os2.def        2008-11-26 12:40:40.000000000 +0100
 302 +++ misc/build/STLport-4.5/src/gcc-3.0-os2.def  2008-10-10 15:05:36.000000000 +0200
 303 @@ -1 +1,40 @@
 304 -dummy
 305 +LIBRARY stlp45 INITINSTANCE TERMINSTANCE
 306 +DATA MULTIPLE
 307 +EXPORTS
 308 +;exports manually added for transex3 project
 309 +__ZN4_STL15basic_streambufIcNS_11char_traitsIcEEE10_M_xsputncEci
 310 +__ZN4_STL8numpunctIcE2idE
 311 +__ZN4_STL15basic_streambufIcNS_11char_traitsIcEEE6xsgetnEPci
 312 +__ZN4_STL15basic_streambufIcNS_11char_traitsIcEEEC2Ev
 313 +__ZN4_STL15basic_streambufIcNS_11char_traitsIcEEE8pubimbueERKNS_6localeE
 314 +__ZN4_STL15basic_streambufIcNS_11char_traitsIcEEE6xsputnEPKci
 315 +__ZN4_STL15basic_streambufIcNS_11char_traitsIcEEE5uflowEv
 316 +__ZN4_STL15basic_streambufIcNS_11char_traitsIcEEED2Ev
 317 +__ZN4_STL7codecvtIcc15__stl_mbstate_tE2idE
 318 +__ZN4_STL5ctypeIcE2idE
 319 +__ZN4_STL5_LimGIbE6_D_infE
 320 +;hwpfilter
 321 + __ZN4_STL15basic_streambufIcNS_11char_traitsIcEEE4syncEv
 322 + __ZN4_STL15basic_streambufIcNS_11char_traitsIcEEE9showmanycEv
 323 + __ZN4_STL15basic_streambufIcNS_11char_traitsIcEEE5imbueERKNS_6localeE
 324 +;testshl2
 325 +__ZNK4_STL5ctypeIcE8scan_notENS_10ctype_base4maskEPKcS5_
 326 +;xml2cmp
 327 +__ZN4_STL15basic_streambufIcNS_11char_traitsIcEEE13_M_snextc_auxEv
 328 +__ZNK4_STL5ctypeIcE7scan_isENS_10ctype_base4maskEPKcS5_
 329 +__ZN4_STL10_UnderflowIcNS_11char_traitsIcEEE7_M_doitEPNS_13basic_filebufIcS2_EE
 330 +__ZN4_STL13_Filebuf_base12_M_page_sizeE
 331 +
 332 +;cppu
 333 +__ZN4_STL12__node_allocILb1ELi0EE11_M_allocateEj
 334 +__ZN4_STL12__node_allocILb1ELi0EE13_M_deallocateEPvj
 335 +__ZN4_STL10_Rb_globalIbE12_M_decrementEPNS_18_Rb_tree_node_baseE
 336 +__ZN4_STL10_Rb_globalIbE10_RebalanceEPNS_18_Rb_tree_node_baseERS3_
 337 +__ZN4_STL10_Rb_globalIbE12_M_incrementEPNS_18_Rb_tree_node_baseE
 338 +__ZN4_STL10_Rb_globalIbE20_Rebalance_for_eraseEPNS_18_Rb_tree_node_baseERS3_S4_S4_
 339 +
 340 +;vcl
 341 +__ZN4_STL12_List_globalIbE9_TransferEPNS_15_List_node_baseES3_S3_
 342 +
 343 +;comphelper
 344 +__ZTVN4_STL13runtime_errorE
 345 --- misc/STLport-4.5/src/gcc-3.0-os2.mak        2008-11-26 12:40:40.000000000 +0100
 346 +++ misc/build/STLport-4.5/src/gcc-3.0-os2.mak  2008-11-03 15:56:24.000000000 +0100
 347 @@ -1 +1,79 @@
 348 -dummy
 349 +#
 350 +# Note : this makefile is for gcc-3 !
 351 +#
 352 +
 353 +#
 354 +# compiler
 355 +# take these from the OOo build environment
 356 +CC*= gcc
 357 +CXX*= g++
 358 +
 359 +#
 360 +# Basename for libraries
 361 +#
 362 +LIB_BASENAME = stlp
 363 +STATIC_SUFFIX=_s
 364 +
 365 +#
 366 +# guts for common stuff
 367 +#
 368 +#
 369 +LINK=emxomfar cr
 370 +DYN_LINK=$(CXX) -Zlinker "DISABLE 1121" -Zomf -Zmap -Zhigh-mem -Zbin-files -Zdll gcc-3.0-os2.def -o
 371 +
 372 +OBJEXT=o
 373 +DYNEXT=so
 374 +DYNEXT=dll
 375 +STEXT=a
 376 +RM=rm -rf
 377 +PATH_SEP=/
 378 +MKDIR=mkdir -p
 379 +COMP=GCC$(ARCH)
 380 +INSTALL_STEP = install_unix
 381 +LN_S = cp
 382 +LDLIBS_RELEASE_dynamic = -lgcc_eh
 383 +LDLIBS_RELEASE_static = -lgcc_eh
 384 +
 385 +#all_static symbolic_links
 386 +all: all_dynamic all_import
 387 +
 388 +include common_macros.mak
 389 +include common_macros_os2.mak
 390 +
 391 +WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized -ftemplate-depth-32
 392 +
 393 +CXXFLAGS_COMMON = -Zomf -D_REENTRANT -DGXX_INCLUDE_PATH=${GXX_INCLUDE_PATH} -fexceptions -I${STLPORT_DIR} ${WARNING_FLAGS} ${ARCH_FLAGS}
 394 +CFLAGS_COMMON = -Zomf -D_REENTRANT -DGXX_INCLUDE_PATH=${GXX_INCLUDE_PATH} -fexceptions -I${STLPORT_DIR} ${WARNING_FLAGS} ${ARCH_FLAGS}
 395 +
 396 +CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -DSTL_OS2_BUILDING -O3 -march=pentium -mtune=pentium4
 397 +CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -DSTL_OS2_BUILDING -O3 -march=pentium -mtune=pentium4
 398 +
 399 +CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
 400 +CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g
 401 +
 402 +CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
 403 +CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
 404 +
 405 +CFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -DSTL_OS2_BUILDING -O3 -march=pentium -mtune=pentium4
 406 +CFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -DSTL_OS2_BUILDING -O3 -march=pentium -mtune=pentium4
 407 +
 408 +CFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
 409 +CFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g
 410 +
 411 +CFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
 412 +CFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
 413 +
 414 +include common_percent_rules.mak
 415 +include common_rules.mak
 416 +
 417 +all_import:
 418 +       emximp -o ..\lib\$(RELEASE_NAME)$(DYNAMIC_SUFFIX).a   ..\lib\$(RELEASE_NAME)$(DYNAMIC_SUFFIX).$(DYNEXT)
 419 +       emximp -o ..\lib\$(RELEASE_NAME)$(DYNAMIC_SUFFIX).lib ..\lib\$(RELEASE_NAME)$(DYNAMIC_SUFFIX).$(DYNEXT)
 420 +
 421 +#install: all
 422 +#      cp -p $(LIB_TARGET) ${D_LIB_TARGET} ../lib
 423 +
 424 +#%.s: %.cpp
 425 +#      $(CXX) $(CXXFLAGS) -O4 -S -pto $<  -o $@
 426 +
 427 +
 428 --- misc/STLport-4.5/src/gcc-3.0.mak    2008-07-18 14:14:26.000000000 +0200
 429 +++ misc/build/STLport-4.5/src/gcc-3.0.mak      2008-07-18 14:13:49.000000000 +0200
 430 @@ -1 +1,69 @@
 431 -dummy
 432 +#
 433 +# Note : this makefile is for gcc-3 !
 434 +#
 435 +
 436 +#
 437 +# compiler
 438 +# take these from the OOo build environment
 439 +CC*= gcc
 440 +CXX*= g++
 441 +
 442 +#
 443 +# Basename for libraries
 444 +#
 445 +LIB_BASENAME = libstlport_gcc
 446 +
 447 +#
 448 +# guts for common stuff
 449 +#
 450 +#
 451 +LINK=ar cr
 452 +DYN_LINK=$(CXX) -Wl,-rpath,'$$ORIGIN' --fexceptions -shared -o
 453 +
 454 +OBJEXT=o
 455 +DYNEXT=so
 456 +STEXT=a
 457 +RM=rm -rf
 458 +PATH_SEP=/
 459 +MKDIR=mkdir -p
 460 +COMP=GCC$(ARCH)
 461 +INSTALL_STEP = install_unix
 462 +
 463 +all:  all_dynamic all_static symbolic_links
 464 +
 465 +include common_macros.mak
 466 +
 467 +WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized
 468 +
 469 +CXXFLAGS_COMMON =  -D_REENTRANT -DGXX_INCLUDE_PATH=${GXX_INCLUDE_PATH} -fexceptions -ftemplate-depth-32 -I${STLPORT_DIR} ${WARNING_FLAGS} ${ARCH_FLAGS}
 470 +CFLAGS_COMMON =  -D_REENTRANT -DGXX_INCLUDE_PATH=${GXX_INCLUDE_PATH} -fexceptions -I${STLPORT_DIR} ${WARNING_FLAGS} ${ARCH_FLAGS}
 471 +
 472 +CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2 -fPIC
 473 +CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 -fPIC
 474 +
 475 +CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g -fPIC
 476 +CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
 477 +
 478 +CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
 479 +CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
 480 +
 481 +CFLAGS_RELEASE_static = $(CFLAGS_COMMON) -O2 -fPIC
 482 +CFLAGS_RELEASE_dynamic = $(CFLAGS_COMMON) -O2 -fPIC
 483 +
 484 +CFLAGS_DEBUG_static = $(CFLAGS_COMMON) -g -fPIC
 485 +CFLAGS_DEBUG_dynamic = $(CFLAGS_COMMON) -g -fPIC
 486 +
 487 +CFLAGS_STLDEBUG_static = $(CFLAGS_DEBUG_static) -D_STLP_DEBUG
 488 +CFLAGS_STLDEBUG_dynamic = $(CFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
 489 +
 490 +include common_percent_rules.mak
 491 +include common_rules.mak
 492 +
 493 +
 494 +#install: all
 495 +#      cp -p $(LIB_TARGET) ${D_LIB_TARGET} ../lib
 496 +
 497 +#%.s: %.cpp
 498 +#      $(CXX) $(CXXFLAGS) -O4 -S -pto $<  -o $@
 499 +
 500 +
 501 --- misc/STLport-4.5/src/gcc-freebsd.mak        2001-07-29 05:36:25.000000000 +0200
 502 +++ misc/build/STLport-4.5/src/gcc-freebsd.mak  2008-07-18 14:13:49.000000000 +0200
 503 @@ -5,8 +5,8 @@
 504  #
 505  # compiler
 506  #
 507 -CC = gcc -pthread
 508 -CXX = c++ -pthread -fexceptions
 509 +CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
 510 +CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
 511
 512  #
 513  # Basename for libraries
 514 @@ -19,7 +19,7 @@
 515  #
 516  LINK=ar cr
 517  # 2.95 flag
 518 -DYN_LINK=c++ -pthread -fexceptions -shared -o
 519 +DYN_LINK=${CXX} ${PTHREAD_LIBS} -fexceptions -shared -o
 520
 521  OBJEXT=o
 522  DYNEXT=so
 523 @@ -39,10 +39,10 @@
 524
 525  WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized -ftemplate-depth-32
 526
 527 -CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS}
 528 +CXXFLAGS_COMMON = -I${STLPORT_DIR} -DGXX_INCLUDE_PATH=${GXX_INCLUDE_PATH} ${WARNING_FLAGS} ${ARCH_FLAGS}
 529
 530 -CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2
 531 -CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 -fPIC
 532 +CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) ${CXXFLAGS}
 533 +CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) ${CXXFLAGS} -fPIC
 534
 535  CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
 536  CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
 537 --- misc/STLport-4.5/stlport/config/stl_gcc.h   2001-09-04 19:10:16.000000000 +0200
 538 +++ misc/build/STLport-4.5/stlport/config/stl_gcc.h     2008-11-14 17:23:02.000000000 +0100
 539 @@ -7,7 +7,9 @@
 540  # define _STLP_USE_GLIBC
 541  #endif
 542
 543 +# if (__GNUC_MINOR__ < 4)  && (__GNUC__ == 3)
 544  #   define _STLP_NO_MEMBER_TEMPLATE_KEYWORD
 545 +# endif
 546
 547  # if defined(__FreeBSD__) || defined (__hpux)
 548  #  define _STLP_NO_WCHAR_T
 549 @@ -51,13 +53,42 @@
 550  #  define _STLP_CLASS_EXPORT_DECLSPEC __attribute__((dllexport))
 551  #  define _STLP_CALL
 552
 553 -#  if defined (_STLP_USE_DYNAMIC_LIB)
 554 -#   define _STLP_USE_DECLSPEC 1
 555 -#   define _STLP_USE_TEMPLATE_EXPORT 1
 556 -#  endif
 557 +#  if !defined (_STLP_NO_OWN_IOSTREAMS)
 558 +
 559 +#    if ( defined (__DLL) || defined (_DLL) || defined (_WINDLL) || defined (_RTLDLL) \
 560 +     || defined(_AFXDLL) || defined (_STLP_USE_DYNAMIC_LIB) ) \
 561 +       && ! defined (_STLP_USE_STATIC_LIB)
 562 +#      undef  _STLP_USE_DECLSPEC
 563 +#      define _STLP_USE_DECLSPEC 1
 564 +/*     Using dynamic library in MinGW requires _STLP_NO_CUSTOM_IO */
 565 +#      define _STLP_NO_CUSTOM_IO
 566 +#    endif
 567 +
 568 +#    ifndef _STLP_IMPORT_TEMPLATE_KEYWORD
 569 +#     define _STLP_IMPORT_TEMPLATE_KEYWORD  extern
 570 +#    endif
 571 +#    define _STLP_EXPORT_TEMPLATE_KEYWORD
 572 +
 573 +#  endif /* _STLP_OWN_IOSTREAMS */
 574
 575  # endif
 576
 577 +# if defined(__EMX__)
 578 +#  define _STLP_EXPORT_DECLSPEC __declspec(dllexport)
 579 +#  define _STLP_IMPORT_DECLSPEC __declspec(dllimport)
 580 +#  define _STLP_CLASS_IMPORT_DECLSPEC __declspec(dllimport)
 581 +#  define _STLP_CLASS_EXPORT_DECLSPEC __declspec(dllexport)
 582 +#  define _STLP_CALL
 583 +//YD 29/03/2006 disable automatic export (generate too many exports/imports)
 584 +//YD 13/04/2006 back again
 585 +//#  define _STLP_EXPORT_DECLSPEC
 586 +//#  define _STLP_IMPORT_DECLSPEC
 587 +//#  define _STLP_CLASS_IMPORT_DECLSPEC
 588 +//#  define _STLP_CLASS_EXPORT_DECLSPEC
 589 +//#  define _STLP_CALL
 590 +#  define _STLP_USE_DECLSPEC 1
 591 +# endif
 592 +
 593  #if (defined(__linux__) /* && ! defined (_GNU_SOURCE) */ ) || \
 594      defined (__CYGWIN__) || defined (__MINGW32__) || !(defined (_STLP_USE_GLIBC) || defined (__sun))
 595  #   define _STLP_NO_NATIVE_MBSTATE_T      1
 596 @@ -226,8 +257,45 @@
 597
 598  # if (__GNUC__ >= 3)
 599
 600 -#  define _STLP_NATIVE_INCLUDE_PATH ../g++-v3
 601 -#  define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v3/backward
 602 +/* properly determine the STLP_NATIVE_INCLUDE_PATH */
 603 +#ifdef i386
 604 +#undef i386
 605 +#define i386 i386
 606 +#endif
 607 +
 608 +#ifdef linux
 609 +#undef linux
 610 +#define linux linux
 611 +#endif
 612 +
 613 +#ifdef mips
 614 +#undef mips
 615 +#define mips mips
 616 +#endif
 617 +
 618 +#ifdef sgi
 619 +#undef sgi
 620 +#define sgi sgi
 621 +#endif
 622 +
 623 +#ifdef sun
 624 +#undef sun
 625 +#define sun sun
 626 +#endif
 627 +
 628 +#ifdef sparc
 629 +#undef sparc
 630 +#define sparc sparc
 631 +#endif
 632 +
 633 +#ifdef powerpc
 634 +#undef powerpc
 635 +#define powerpc powerpc
 636 +#endif
 637 +
 638 +#  define _STLP_NATIVE_INCLUDE_PATH GXX_INCLUDE_PATH
 639 +#  define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH \
 640 +          GXX_INCLUDE_PATH/backward
 641
 642  # elif (__GNUC_MINOR__ < 8)
 643
 644 @@ -312,6 +380,7 @@
 645  #   define _STLP_STATIC_TEMPLATE_DATA 1
 646  # endif
 647
 648 -
 649 -
 650 -
 651 +#if defined(__sun__) && defined(__GNUC__)
 652 +#    undef _STLP_HAS_NATIVE_FLOAT_ABS
 653 +#    define _STLP_VENDOR_GLOBAL_CSTD       1
 654 +#endif
 655 --- misc/STLport-4.5/stlport/cwchar     2001-01-27 02:39:42.000000000 +0100
 656 +++ misc/build/STLport-4.5/stlport/cwchar       2008-07-18 14:13:49.000000000 +0200
 657 @@ -21,6 +21,9 @@
 658  #  include <stl/_prolog.h>
 659  # endif
 660
 661 +#ifdef __FreeBSD__
 662 +#include _STLP_NATIVE_C_HEADER(wchar.h)
 663 +#endif
 664  # include <stl/_cwchar.h>
 665
 666  # if (_STLP_OUTERMOST_HEADER_ID == 0x120)
 667 --- misc/STLport-4.5/stlport/stdexcept  2001-05-22 02:50:21.000000000 +0200
 668 +++ misc/build/STLport-4.5/stlport/stdexcept    2008-07-18 14:13:49.000000000 +0200
 669 @@ -49,6 +49,13 @@
 670
 671  _STLP_BEGIN_NAMESPACE
 672
 673 +
 674 +#if defined( __GNUC__)
 675 +#undef _STLP_NOTHROW_INHERENTLY
 676 +#define _STLP_NOTHROW_INHERENTLY throw()
 677 +#endif
 678 +
 679 +
 680  class _STLP_CLASS_DECLSPEC __Named_exception : public _STLP_EXCEPTION_BASE {
 681  public:
 682    __Named_exception(const string& __str)
 683 --- misc/STLport-4.5/stlport/stl/_bvector.h     2001-05-30 05:45:41.000000000 +0200
 684 +++ misc/build/STLport-4.5/stlport/stl/_bvector.h       2008-07-18 14:13:49.000000000 +0200
 685 @@ -34,7 +34,7 @@
 686  # include <stl/_vector.h>
 687  # endif
 688
 689 -#define __WORD_BIT (int(CHAR_BIT*sizeof(unsigned int)))
 690 +#define ___WORD_BIT (int(CHAR_BIT*sizeof(unsigned int)))
 691
 692  _STLP_BEGIN_NAMESPACE
 693
 694 @@ -80,7 +80,7 @@
 695    unsigned int  _M_offset;
 696
 697    void _M_bump_up() {
 698 -    if (_M_offset++ == __WORD_BIT - 1) {
 699 +    if (_M_offset++ == ___WORD_BIT - 1) {
 700        _M_offset = 0;
 701        ++_M_p;
 702      }
 703 @@ -88,7 +88,7 @@
 704
 705    void _M_bump_down() {
 706      if (_M_offset-- == 0) {
 707 -      _M_offset = __WORD_BIT - 1;
 708 +      _M_offset = ___WORD_BIT - 1;
 709        --_M_p;
 710      }
 711    }
 712 @@ -100,17 +100,17 @@
 713
 714    void _M_advance (difference_type __i) {
 715      difference_type __n = __i + _M_offset;
 716 -    _M_p += __n / __WORD_BIT;
 717 -    __n = __n % __WORD_BIT;
 718 +    _M_p += __n / ___WORD_BIT;
 719 +    __n = __n % ___WORD_BIT;
 720      if (__n < 0) {
 721 -      _M_offset = (unsigned int) __n + __WORD_BIT;
 722 +      _M_offset = (unsigned int) __n + ___WORD_BIT;
 723        --_M_p;
 724      } else
 725        _M_offset = (unsigned int) __n;
 726    }
 727
 728    difference_type _M_subtract(const _Bit_iterator_base& __x) const {
 729 -    return __WORD_BIT * (_M_p - __x._M_p) + _M_offset - __x._M_offset;
 730 +    return ___WORD_BIT * (_M_p - __x._M_p) + _M_offset - __x._M_offset;
 731    }
 732  };
 733
 734 @@ -242,7 +242,7 @@
 735  protected:
 736
 737    unsigned int* _M_bit_alloc(size_t __n)
 738 -    { return _M_end_of_storage.allocate((__n + __WORD_BIT - 1)/__WORD_BIT); }
 739 +    { return _M_end_of_storage.allocate((__n + ___WORD_BIT - 1)/___WORD_BIT); }
 740    void _M_deallocate() {
 741      if (_M_start._M_p)
 742        _M_end_of_storage.deallocate(_M_start._M_p,
 743 @@ -341,7 +341,7 @@
 744
 745    void _M_initialize(size_type __n) {
 746      unsigned int* __q = this->_M_bit_alloc(__n);
 747 -    this->_M_end_of_storage._M_data = __q + (__n + __WORD_BIT - 1)/__WORD_BIT;
 748 +    this->_M_end_of_storage._M_data = __q + (__n + ___WORD_BIT - 1)/___WORD_BIT;
 749      this->_M_start = iterator(__q, 0);
 750      this->_M_finish = this->_M_start + difference_type(__n);
 751    }
 752 @@ -352,13 +352,13 @@
 753        ++this->_M_finish;
 754      }
 755      else {
 756 -      size_type __len = size() ? 2 * size() : __WORD_BIT;
 757 +      size_type __len = size() ? 2 * size() : ___WORD_BIT;
 758        unsigned int* __q = this->_M_bit_alloc(__len);
 759        iterator __i = copy(begin(), __position, iterator(__q, 0));
 760        *__i++ = __x;
 761        this->_M_finish = copy(__position, end(), __i);
 762        this->_M_deallocate();
 763 -      this->_M_end_of_storage._M_data = __q + (__len + __WORD_BIT - 1)/__WORD_BIT;
 764 +      this->_M_end_of_storage._M_data = __q + (__len + ___WORD_BIT - 1)/___WORD_BIT;
 765        this->_M_start = iterator(__q, 0);
 766      }
 767    }
 768 @@ -411,7 +411,7 @@
 769          __i = copy(__first, __last, __i);
 770          this->_M_finish = copy(__position, end(), __i);
 771          this->_M_deallocate();
 772 -        this->_M_end_of_storage._M_data = __q + (__len + __WORD_BIT - 1)/__WORD_BIT;
 773 +        this->_M_end_of_storage._M_data = __q + (__len + ___WORD_BIT - 1)/___WORD_BIT;
 774          this->_M_start = iterator(__q, 0);
 775        }
 776      }
 777 @@ -609,7 +609,7 @@
 778        this->_M_finish = copy(begin(), end(), __z);
 779        this->_M_deallocate();
 780        this->_M_start = iterator(__q, 0);
 781 -      this->_M_end_of_storage._M_data = __q + (__n + __WORD_BIT - 1)/__WORD_BIT;
 782 +      this->_M_end_of_storage._M_data = __q + (__n + ___WORD_BIT - 1)/___WORD_BIT;
 783      }
 784    }
 785
 786 @@ -681,7 +681,7 @@
 787        __i = copy(__first, __last, __i);
 788        this->_M_finish = copy(__position, end(), __i);
 789        this->_M_deallocate();
 790 -      this->_M_end_of_storage._M_data = __q + (__len + __WORD_BIT - 1)/__WORD_BIT;
 791 +      this->_M_end_of_storage._M_data = __q + (__len + ___WORD_BIT - 1)/___WORD_BIT;
 792        this->_M_start = iterator(__q, 0);
 793      }
 794    }
 795 @@ -702,7 +702,7 @@
 796        __i = copy(__first, __last, __i);
 797        this->_M_finish = copy(__position, end(), __i);
 798        this->_M_deallocate();
 799 -      this->_M_end_of_storage._M_data = __q + (__len + __WORD_BIT - 1)/__WORD_BIT;
 800 +      this->_M_end_of_storage._M_data = __q + (__len + ___WORD_BIT - 1)/___WORD_BIT;
 801        this->_M_start = iterator(__q, 0);
 802      }
 803    }
 804 @@ -722,7 +722,7 @@
 805        fill_n(__i, __n, __x);
 806        this->_M_finish = copy(__position, end(), __i + difference_type(__n));
 807        this->_M_deallocate();
 808 -      this->_M_end_of_storage._M_data = __q + (__len + __WORD_BIT - 1)/__WORD_BIT;
 809 +      this->_M_end_of_storage._M_data = __q + (__len + ___WORD_BIT - 1)/___WORD_BIT;
 810        this->_M_start = iterator(__q, 0);
 811      }
 812    }
 813 @@ -799,7 +799,7 @@
 814  #undef __BVECTOR_QUALIFIED
 815  #undef __BVEC_TMPL_HEADER
 816
 817 -# undef __WORD_BIT
 818 +# undef ___WORD_BIT
 819
 820  #endif /* _STLP_INTERNAL_BVECTOR_H */
 821
 822 --- misc/STLport-4.5/stlport/stl/_complex.h     2001-07-06 06:16:17.000000000 +0200
 823 +++ misc/build/STLport-4.5/stlport/stl/_complex.h       2008-07-18 14:13:49.000000000 +0200
 824 @@ -18,6 +18,10 @@
 825  #ifndef _STLP_internal_complex_h
 826  #define _STLP_internal_complex_h
 827
 828 +#if defined __GNUC__
 829 +#pragma GCC system_header
 830 +#endif
 831 +
 832  // This header declares the template class complex, as described in
 833  // in the draft C++ standard.  Single-precision complex numbers
 834  // are complex<float>, double-precision are complex<double>, and
 835 --- misc/STLport-4.5/stlport/stl/_config.h      2001-09-04 19:10:18.000000000 +0200
 836 +++ misc/build/STLport-4.5/stlport/stl/_config.h        2008-07-18 14:14:05.000000000 +0200
 837 @@ -938,7 +938,7 @@
 838
 839  #  define _STLP_EXPORT_TEMPLATE_CLASS _STLP_EXPORT template class _STLP_CLASS_DECLSPEC
 840
 841 -#  if defined (_STLP_MSVC) || defined (__ICL)
 842 +#  if defined (_STLP_MSVC) || defined (__ICL)  || defined (__EMX__)
 843  #   define _STLP_STATIC_MEMBER_DECLSPEC
 844  #  else
 845  #   define _STLP_STATIC_MEMBER_DECLSPEC _STLP_DECLSPEC
 846 --- misc/STLport-4.5/stlport/stl/_fstream.h     2001-05-29 01:29:41.000000000 +0200
 847 +++ misc/build/STLport-4.5/stlport/stl/_fstream.h       2008-07-18 14:14:05.000000000 +0200
 848 @@ -45,7 +45,7 @@
 849  #if !defined (_STLP_USE_UNIX_IO) && !defined(_STLP_USE_WIN32_IO) \
 850      && ! defined (_STLP_USE_UNIX_EMULATION_IO) && !defined (_STLP_USE_STDIO_IO)
 851
 852 -# if defined (_STLP_UNIX)  || defined (__CYGWIN__)
 853 +# if defined (_STLP_UNIX)  || defined (__CYGWIN__)  || defined (__EMX__)
 854  // open/close/read/write
 855  #  define _STLP_USE_UNIX_IO
 856  # elif defined (_STLP_WIN32)  && ! defined (__CYGWIN__)
 857 @@ -107,7 +107,7 @@
 858    streamoff _M_get_offset(char* __first, char* __last) {
 859  #if defined (_STLP_UNIX) || defined (_STLP_MAC)
 860      return __last - __first;
 861 -#else // defined (_STLP_WIN32) || defined (_STLP_WIN16) || defined (_STLP_DOS)
 862 +#else // defined (_STLP_WIN32) || defined (_STLP_WIN16) || defined (_STLP_DOS) || defined (__EMX__)
 863      return ( (_M_openmode & ios_base::binary) != 0 )
 864        ? (__last - __first)
 865        : count(__first, __last, '\n') + (__last - __first);
 866 @@ -119,7 +119,7 @@
 867    bool _M_in_binary_mode() const {
 868  # if defined (_STLP_UNIX) || defined (_STLP_MAC)  || defined(__BEOS__)
 869      return true;
 870 -# elif defined (_STLP_WIN32) || defined (_STLP_WIN16) || defined (_STLP_DOS) || defined (_STLP_VM)
 871 +# elif defined (_STLP_WIN32) || defined (_STLP_WIN16) || defined (_STLP_DOS) || defined (_STLP_VM) || defined (__EMX__)
 872      return (_M_openmode & ios_base::binary) != 0;
 873  # else
 874  #   error "Port!"
 875 --- misc/STLport-4.5/stlport/stl/_ios_base.h    2001-09-04 19:10:18.000000000 +0200
 876 +++ misc/build/STLport-4.5/stlport/stl/_ios_base.h      2008-07-18 14:13:49.000000000 +0200
 877 @@ -291,7 +291,7 @@
 878  template <class Facet>
 879  locale::facet* _M_get_facet(ios_base& __i, Facet*)
 880  {
 881 -
 882 +    return NULL;
 883  }
 884
 885  // ----------------------------------------------------------------------
 886 --- misc/STLport-4.5/stlport/stl/_rope.h        2001-08-06 04:21:25.000000000 +0200
 887 +++ misc/build/STLport-4.5/stlport/stl/_rope.h  2008-07-18 14:13:49.000000000 +0200
 888 @@ -1470,7 +1470,7 @@
 889      rope<_CharT,_Alloc> __remainder_rope;
 890
 891      // gcc-2.7.2 bugs
 892 -    typedef _Rope_Concat_fn<_CharT,_Alloc> _Concat_fn;
 893 +    typedef _Rope_Concat_fn<_CharT,_Alloc> __Concat_fn;
 894
 895      if (0 == __n)
 896        return;
 897 @@ -1510,7 +1510,7 @@
 898                 // One each for base_rope and __result
 899  #         endif
 900        } else {
 901 -               __result = power(__base_rope, __exponent, _Concat_fn());
 902 +               __result = power(__base_rope, __exponent, __Concat_fn());
 903        }
 904        if (0 != __remainder) {
 905                 __result += __remainder_rope;
 906 --- misc/STLport-4.5/stlport/stl/_stdio_file.h  2001-03-19 08:01:09.000000000 +0100
 907 +++ misc/build/STLport-4.5/stlport/stl/_stdio_file.h    2008-07-18 14:14:05.000000000 +0200
 908 @@ -154,8 +154,45 @@
 909
 910  # define _STLP_FILE_I_O_IDENTICAL
 911
 912 +#elif defined(__EMX__)
 913 +
 914 +inline int   _FILE_fd(const FILE& __f) { return __f._handle; }
 915 +inline char* _FILE_I_begin(const FILE& __f) { return (char*) __f._buffer; }
 916 +inline char* _FILE_I_next(const FILE& __f) { return (char*) __f._ptr; }
 917 +inline char* _FILE_I_end(const FILE& __f) { return (char *) __f._ptr + __f._rcount; }
 918 +inline ptrdiff_t _FILE_I_avail(const FILE& __f) { return __f._rcount; }
 919 +inline char& _FILE_I_preincr(FILE& __f) { --__f._rcount; return *(char*) (++__f._ptr); }
 920 +inline char& _FILE_I_postincr(FILE& __f) { --__f._rcount; return *(char*) (__f._ptr++); }
 921 +inline char& _FILE_I_predecr(FILE& __f) { ++__f._rcount; return *(char*) (--__f._ptr); }
 922 +inline char& _FILE_I_postdecr(FILE& __f) { ++__f._rcount; return *(char*) (__f._ptr--); }
 923 +inline void  _FILE_I_bump(FILE& __f, int __n) { __f._ptr += __n; __f._rcount -= __n; }
 924 +inline void _FILE_I_set(FILE& __f, char* __begin, char* __next, char* __end) {
 925 +  __f._buffer = __begin;
 926 +  __f._ptr  = __next;
 927 +  __f._rcount  = __end - __next;
 928 +}
 929 +
 930 +inline char* _FILE_O_begin(const FILE& __f) { return (char*) __f._buffer; }
 931 +inline char* _FILE_O_next(const FILE& __f) { return (char*) __f._ptr; }
 932 +inline char* _FILE_O_end(const FILE& __f) { return (char*) __f._ptr + __f._wcount; }
 933 +inline ptrdiff_t _FILE_O_avail(const FILE& __f) { return __f._wcount; }
 934 +inline char& _FILE_O_preincr(FILE& __f) { --__f._wcount; return *(char*) (++__f._ptr); }
 935 +inline char& _FILE_O_postincr(FILE& __f) { --__f._wcount; return *(char*) (__f._ptr++); }
 936 +inline char& _FILE_O_predecr(FILE& __f) { ++__f._wcount; return *(char*) (--__f._ptr); }
 937 +inline char& _FILE_O_postdecr(FILE& __f) { ++__f._wcount; return *(char*) (__f._ptr--); }
 938 +inline void _FILE_O_bump(FILE& __f, int __n) { __f._ptr += __n; __f._wcount -= __n; }
 939 +inline void _FILE_O_set(FILE& __f, char* __begin, char* __next, char* __end) {
 940 +  __f._buffer = __begin;
 941 +  __f._ptr  = __next;
 942 +  __f._wcount  = __end - __next;
 943 +}
 944 +
 945 +
 946 +# undef _STLP_FILE_I_O_IDENTICAL
 947 +
 948  #elif defined (__CYGWIN__) || defined(__FreeBSD__)  || defined(__NetBSD__) || ( defined(__GNUC__) && defined(__APPLE__) )
 949
 950 +#include <stdio.h>
 951  # if 0
 952  inline int   _FILE_fd(const FILE& __f) { return __f._file; }
 953  inline char* _FILE_I_begin(const FILE& __f) { return (char*) __f._bf._base; }
 954 --- misc/STLport-4.5/stlport/stl/_threads.h     2001-09-04 19:10:20.000000000 +0200
 955 +++ misc/build/STLport-4.5/stlport/stl/_threads.h       2008-07-18 14:14:05.000000000 +0200
 956 @@ -164,6 +164,15 @@
 957  #include <stdio.h>
 958  #  define _STLP_MUTEX_INITIALIZER = { 0 }
 959  #elif defined(_STLP_OS2THREADS)
 960 +
 961 +#define INCL_DOSSEMAPHORES
 962 +#ifndef STL_OS2_BUILDING
 963 +#include <svpm.h>
 964 +#else
 965 +#include <os2.h>
 966 +#endif
 967 +
 968 +#if 0 // YD
 969    // This section serves to replace os2.h for VisualAge C++
 970    typedef unsigned long ULONG;
 971    #ifndef __HEV__  /* INCL_SEMAPHORE may also define HEV */
 972 @@ -181,6 +190,8 @@
 973    APIRET _System DosRequestMutexSem(HMTX hmtx, ULONG ulTimeout);
 974    APIRET _System DosReleaseMutexSem(HMTX hmtx);
 975    APIRET _System DosCloseMutexSem(HMTX hmtx);
 976 +#endif
 977 +
 978  # define _STLP_MUTEX_INITIALIZER = { 0 };
 979
 980  # endif
 981 @@ -296,7 +307,7 @@
 982    inline void _M_destroy() { DosCloseMutexSem(_M_lock); }
 983    inline void _M_acquire_lock() {
 984      if(!_M_lock) _M_initialize();
 985 -    DosRequestMutexSem(_M_lock, -1);
 986 +    DosRequestMutexSem(_M_lock, ((ULONG)-1));
 987    }
 988    inline void _M_release_lock() { DosReleaseMutexSem(_M_lock); }
 989  #elif defined(_STLP_BETHREADS)
 990 @@ -372,7 +383,7 @@
 991    }
 992    inline void _M_acquire_lock() {
 993      if(!_M_lock) _M_initialize();
 994 -    DosRequestMutexSem(*(HMTX*)_M_lock, -1);
 995 +    DosRequestMutexSem(*(HMTX*)_M_lock, ((ULONG)-1));
 996    }
 997    inline void _M_release_lock() { DosReleaseMutexSem(*(HMTX*)_M_lock); }
 998  # else /* No threads */
 999 --- misc/STLport-4.5/stlport/stl/_tree.c        2001-08-25 03:14:30.000000000 +0200
1000 +++ misc/build/STLport-4.5/stlport/stl/_tree.c  2008-12-02 17:14:29.035425872 +0100
1001 @@ -404,10 +404,12 @@
1002    }
1003    iterator __j = iterator(__y);
1004    if (__comp)
1005 +  {
1006      if (__j == begin())
1007        return pair<iterator,bool>(_M_insert(__x, __y, __v), true);
1008      else
1009        --__j;
1010 +  }
1011    if (_M_key_compare(_S_key(__j._M_node), _KeyOfValue()(__v)))
1012      return pair<iterator,bool>(_M_insert(__x, __y, __v), true);
1013    return pair<iterator,bool>(__j, false);
1014 --- misc/STLport-4.5/stlport/stl/_valarray.h    2001-05-30 05:45:42.000000000 +0200
1015 +++ misc/build/STLport-4.5/stlport/stl/_valarray.h      2008-07-18 14:13:49.000000000 +0200
1016 @@ -19,6 +19,10 @@
1017  #ifndef _STLP_VALARRAY_H
1018  #define _STLP_VALARRAY_H
1019
1020 +#if defined __GNUC__
1021 +#pragma GCC system_header
1022 +#endif
1023 +
1024  #ifndef _STLP_CMATH
1025  #include <cmath>
1026  #endif
1027 --- misc/STLport-4.5/stlport/stl/c_locale.h     2001-05-31 05:24:41.000000000 +0200
1028 +++ misc/build/STLport-4.5/stlport/stl/c_locale.h       2008-07-18 14:14:05.000000000 +0200
1029 @@ -167,6 +167,18 @@
1030  #  define _Locale_ALPHA  (_Locale_UPPER | _Locale_LOWER)
1031  #  define _Locale_PRINT  (_Locale_ALPHA | _Locale_DIGIT | _Locale_PUNCT | 0200 )
1032
1033 +# elif defined (__EMX__) // YD
1034 +
1035 +# define _Locale_CNTRL __CT_CNTRL
1036 +# define _Locale_UPPER __CT_UPPER
1037 +# define _Locale_LOWER __CT_LOWER
1038 +# define _Locale_DIGIT __CT_DIGIT
1039 +# define _Locale_XDIGIT __CT_XDIGIT
1040 +# define _Locale_PUNCT __CT_PUNCT
1041 +# define _Locale_SPACE __CT_SPACE
1042 +# define _Locale_PRINT __CT_PRINT
1043 +# define _Locale_ALPHA __CT_ALPHA
1044 +
1045  # elif defined (__FreeBSD__)
1046
1047  # define _Locale_CNTRL _CTYPE_C