From: <sm...@us...> - 2008-10-14 20:44:16
|
Revision: 8898 http://plplot.svn.sourceforge.net/plplot/?rev=8898&view=rev Author: smekal Date: 2008-10-14 20:44:03 +0000 (Tue, 14 Oct 2008) Log Message: ----------- Uncomment the redefinition of tmpfile to w32_tmpfile. MinGW and Visual C++ provide a tmpfile() function and I couldn't find any useful reference of w32_tmpfile in google anyways. Modified Paths: -------------- trunk/include/plplotP.h Modified: trunk/include/plplotP.h =================================================================== --- trunk/include/plplotP.h 2008-10-14 20:41:26 UTC (rev 8897) +++ trunk/include/plplotP.h 2008-10-14 20:44:03 UTC (rev 8898) @@ -116,7 +116,7 @@ #if defined(PLPLOT_WINTK) #elif defined(WIN32) &! defined (__GNUC__) /* Redefine tmpfile()! (AM)*/ -#define tmpfile w32_tmpfile +/* #define tmpfile w32_tmpfile */ #else #include <unistd.h> #endif @@ -132,22 +132,26 @@ When the dirent.h file will be fixed upstream by Apple Inc, this should go away. */ # ifdef NEED_SYS_TYPE_H -# include <sys/types.h> +# include <sys/types.h> # endif # include <dirent.h> # define NAMLEN(dirent) strlen((dirent)->d_name) #else -# define dirent direct -# define NAMLEN(dirent) (dirent)->d_namlen -# if HAVE_SYS_NDIR_H -# include <sys/ndir.h> +# if defined(_MSC_VER) +# include "dirent_msvc.h" +# else +# define dirent direct +# define NAMLEN(dirent) (dirent)->d_namlen +# if HAVE_SYS_NDIR_H +# include <sys/ndir.h> +# endif +# if HAVE_SYS_DIR_H +# include <sys/dir.h> +# endif +# if HAVE_NDIR_H +# include <ndir.h> +# endif # endif -# if HAVE_SYS_DIR_H -# include <sys/dir.h> -# endif -# if HAVE_NDIR_H -# include <ndir.h> -# endif #endif /* This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |