"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "layer0/os_predef.h" between
pymol-v2.1.0.tar.bz2 and pymol-open-source-2.2.0.tar.gz

About: PyMOL is a Python-enhanced molecular graphics tool. It excels at 3D visualization of proteins, small molecules, density, surfaces, and trajectories. It also includes molecular editing, ray tracing, and movies. Open Source version.

os_predef.h  (pymol-v2.1.0.tar.bz2)	:	os_predef.h  (pymol-open-source-2.2.0)
skipping to change at line 48		skipping to change at line 48
typedef int aliased_int;		typedef int aliased_int;
typedef float aliased_float;		typedef float aliased_float;
#endif		#endif
#else		#else
typedef int aliased_int;		typedef int aliased_int;
typedef float aliased_float;		typedef float aliased_float;
#endif		#endif
/* BEGIN PROPRIETARY CODE SEGMENT (see disclaimer in "os_proprietary.h") */		/* BEGIN PROPRIETARY CODE SEGMENT (see disclaimer in "os_proprietary.h") */
#ifdef WIN32		#if defined(_MSC_VER)
#define __inline__ __inline		#define __inline__ __inline
#endif		#endif
#ifdef WIN32		#ifdef WIN32
#define PATH_SEP "\\"		#define PATH_SEP "\\"
#else		#else
#define PATH_SEP "/"		#define PATH_SEP "/"
#endif		#endif
/* commercial product */		/* commercial product */
skipping to change at line 107		skipping to change at line 107
#endif		#endif
/* END PROPRIETARY CODE SEGMENT */		/* END PROPRIETARY CODE SEGMENT */
#ifdef __linux__		#ifdef __linux__
#include <malloc.h>		#include <malloc.h>
#else		#else
#include <stddef.h>		#include <stddef.h>
#endif		#endif
#if defined(_WIN32) || defined(_WIN64)		#if defined(_MSC_VER) && (_MSC_VER < 1900)
#pragma warning (disable:4996)		#pragma warning (disable:4996)
#if !defined(snprintf) && (_MSC_VER < 1900)		#if !defined(snprintf) && (_MSC_VER < 1900)
#define snprintf sprintf_s		#define snprintf sprintf_s
#endif		#endif
#endif		#endif
#include "ov_types.h"		#include "ov_types.h"
// alternative to std::swap if references are not allowed (e.g. bit fields)		// alternative to std::swap if references are not allowed (e.g. bit fields)
#define SWAP_NOREF(a, b) {auto _t=(a);(a)=(b);(b)=_t;}		#define SWAP_NOREF(a, b) {auto _t=(a);(a)=(b);(b)=_t;}
End of changes. 2 change blocks.
2 lines changed or deleted		2 lines changed or added

---