X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Fcompiler.h;h=19b0c77879321b99b6a1cdf1a113a841248c2cdb;hb=c8c693db53abb8c71f253e0f8698c457a2c74edf;hp=c2a5b28e691ceba4d8490893f05a1d5d8dfb08cb;hpb=dc09a50472890ac706d3c76d8af34cc3682ada0c;p=simgear.git diff --git a/simgear/compiler.h b/simgear/compiler.h index c2a5b28e..19b0c778 100644 --- a/simgear/compiler.h +++ b/simgear/compiler.h @@ -11,10 +11,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Library General Public License for more details. * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ * @@ -231,6 +230,7 @@ # define isnan _isnan # define snprintf _snprintf +# define copysign _copysign # pragma warning(disable: 4786) // identifier was truncated to '255' characters # pragma warning(disable: 4244) // conversion from double to float @@ -324,7 +324,7 @@ #endif // Native SGI compilers -#if defined ( sun ) +#if defined (__sun) # include # include # if defined ( __cplusplus ) @@ -467,13 +467,5 @@ inline const_mem_fun_ref_t<_Ret,_Tp> mem_fun_ref(_Ret (_Tp::*__f)() const) #endif // SG_INCOMPLETE_FUNCTIONAL - -// stdint.h defines -#if defined( _MSC_VER ) || defined(__MINGW32__) || defined(sun) -typedef signed short int16_t; -typedef signed int int32_t; -typedef unsigned short uint16_t; -typedef unsigned int uint32_t; -#endif - #endif // _SG_COMPILER_H +