mirror of
https://github.com/reactos/reactos.git
synced 2025-06-12 07:58:28 +00:00
[HEADERS]
- move stlport headers to the c++ directory - add a specific _reactos.h configuration file for stlport - add cerrno to c++ headers - __declspec(nothrow) must be placed before calling convention with msvc. GCC doesn't care. We now use our headers with both msvc and gcc. svn path=/branches/cmake-bringup/; revision=49565
This commit is contained in:
parent
5e8bd0b3df
commit
6b0b6cb78f
331 changed files with 354 additions and 32 deletions
|
@ -121,15 +121,11 @@ MACRO(add_minicd FILENAME _dir _nameoncd)
|
||||||
ENDMACRO(add_minicd)
|
ENDMACRO(add_minicd)
|
||||||
|
|
||||||
macro(set_cpp)
|
macro(set_cpp)
|
||||||
include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/stlport)
|
include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/c++/stlport)
|
||||||
set(IS_CPP 1)
|
set(IS_CPP 1)
|
||||||
add_definitions(
|
add_definitions(
|
||||||
-D_STLP_NATIVE_CPP_C_INCLUDE_PATH=../c++
|
-DNATIVE_CPP_INCLUDE=${REACTOS_SOURCE_DIR}/include/c++
|
||||||
-D_STLP_NATIVE_C_INCLUDE_PATH=../crt
|
-DNATIVE_C_INCLUDE=${REACTOS_SOURCE_DIR}/include/crt)
|
||||||
-D_STLP_NATIVE_CPP_RUNTIME_INCLUDE_PATH=../c++
|
|
||||||
-D_STLP_USE_NEW_C_HEADERS
|
|
||||||
-D_STLP_NO_TYPEINFO
|
|
||||||
)
|
|
||||||
endmacro()
|
endmacro()
|
||||||
|
|
||||||
MACRO(add_livecd_target _targetname _dir )# optional parameter : _nameoncd
|
MACRO(add_livecd_target _targetname _dir )# optional parameter : _nameoncd
|
||||||
|
|
10
include/c++/cerrno
Normal file
10
include/c++/cerrno
Normal file
|
@ -0,0 +1,10 @@
|
||||||
|
// C++ forwarding C errno header.
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <errno.h>
|
||||||
|
|
||||||
|
// Adhere to section 17.4.1.2 clause 5 of ISO 14882:1998
|
||||||
|
#ifndef errno
|
||||||
|
#define errno errno
|
||||||
|
#endif
|
|
@ -94,4 +94,5 @@ namespace std
|
||||||
using ::vfprintf;
|
using ::vfprintf;
|
||||||
using ::vprintf;
|
using ::vprintf;
|
||||||
using ::vsprintf;
|
using ::vsprintf;
|
||||||
|
using ::vsnprintf;
|
||||||
}
|
}
|
||||||
|
|
|
@ -32,19 +32,17 @@ typedef void (*new_handler)();
|
||||||
|
|
||||||
new_handler set_new_handler(new_handler) throw();
|
new_handler set_new_handler(new_handler) throw();
|
||||||
|
|
||||||
void* operator new (std::size_t size) throw (std::bad_alloc);
|
|
||||||
void* operator new (std::size_t size, const std::nothrow_t& nothrow_constant) throw();
|
void* operator new (std::size_t size, const std::nothrow_t& nothrow_constant) throw();
|
||||||
void* operator new (std::size_t size, void* ptr) throw();
|
inline void* operator new (std::size_t size, void* ptr) throw() { return ptr; }
|
||||||
void* operator new[] (std::size_t size) throw (std::bad_alloc);
|
|
||||||
void* operator new[] (std::size_t size, const std::nothrow_t& nothrow_constant) throw();
|
void* operator new[] (std::size_t size, const std::nothrow_t& nothrow_constant) throw();
|
||||||
void* operator new[] (std::size_t size, void* ptr) throw();
|
inline void* operator new[] (std::size_t size, void* ptr) throw() { return ptr; }
|
||||||
|
|
||||||
void operator delete (void* ptr) throw ();
|
void operator delete (void* ptr) throw ();
|
||||||
void operator delete (void* ptr, const std::nothrow_t& nothrow_constant) throw();
|
void operator delete (void* ptr, const std::nothrow_t& nothrow_constant) throw();
|
||||||
void operator delete (void* ptr, void* voidptr2) throw();
|
inline void operator delete (void* ptr, void* voidptr2) throw() { }
|
||||||
void operator delete[] (void* ptr) throw ();
|
void operator delete[] (void* ptr) throw ();
|
||||||
void operator delete[] (void* ptr, const std::nothrow_t& nothrow_constant) throw();
|
void operator delete[] (void* ptr, const std::nothrow_t& nothrow_constant) throw();
|
||||||
void operator delete[] (void* ptr, void* voidptr2) throw();
|
inline void operator delete[] (void* ptr, void* voidptr2) throw() { }
|
||||||
//@}
|
//@}
|
||||||
} // extern "C++"
|
} // extern "C++"
|
||||||
|
|
||||||
|
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue