[Plplot-cvs] SF.net SVN: plplot:[9632] trunk/include

[<sm...@us...>]

Revision: 9632
          http://plplot.svn.sourceforge.net/plplot/?rev=9632&view=rev
Author:   smekal
Date:     2009-02-27 21:24:47 +0000 (Fri, 27 Feb 2009)

Log Message:
-----------
The macros regarding dirent where moved from plplotP.h to plcore.c, since dirent is only used there. This is more efficient for Visual C++ where dirent_msvc.h was always included (with code) and dirent_msvc.h doesn't need to be installed into the install tree anymore.

Modified Paths:
--------------
    trunk/include/CMakeLists.txt
    trunk/include/plplotP.h

Modified: trunk/include/CMakeLists.txt
===================================================================
--- trunk/include/CMakeLists.txt	2009-02-27 21:20:10 UTC (rev 9631)
+++ trunk/include/CMakeLists.txt	2009-02-27 21:24:47 UTC (rev 9632)
@@ -73,7 +73,4 @@
 ${CMAKE_CURRENT_BINARY_DIR}/plConfig.h
 ${CMAKE_CURRENT_BINARY_DIR}/plDevs.h
 )
-if(MSVC)
-	set(include_INSTALLED_HEADERS ${include_INSTALLED_HEADERS} dirent_msvc.h)
-endif(MSVC)
 install(FILES ${include_INSTALLED_HEADERS} DESTINATION ${INCLUDE_DIR})

Modified: trunk/include/plplotP.h
===================================================================
--- trunk/include/plplotP.h	2009-02-27 21:20:10 UTC (rev 9631)
+++ trunk/include/plplotP.h	2009-02-27 21:24:47 UTC (rev 9632)
@@ -127,33 +127,6 @@
 #define M_PI 3.14159265358979323846
 #endif
 
-#if HAVE_DIRENT_H
-/* The following conditional is a workaround for a bug in the MacOSX system.
-   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>
-# endif
-# include <dirent.h>
-# define NAMLEN(dirent) strlen((dirent)->d_name)
-#else
-# 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
-#endif
-
 /*
  * Macros for file positioning.  I tried switching to f[sg]etpos() because I
  * like the semantics better, but ran into the problem that fpos_t is not


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.