Revision: 41999
http://brlcad.svn.sourceforge.net/brlcad/?rev=41999&view=rev
Author: starseeker
Date: 2011-01-06 23:53:54 +0000 (Thu, 06 Jan 2011)
Log Message:
-----------
Sync cmake branch to trunk r41998
Modified Paths:
--------------
brlcad/branches/cmake/include/opennurbs_ext.h
brlcad/branches/cmake/src/libfft/fft.h
Property Changed:
----------------
brlcad/branches/cmake/
Property changes on: brlcad/branches/cmake
___________________________________________________________________
Modified: svn:mergeinfo
- /brlcad/trunk:37932-39894,41673-41706
+ /brlcad/trunk:37932-39894,41673-41706,41994-41998
Modified: brlcad/branches/cmake/include/opennurbs_ext.h
===================================================================
--- brlcad/branches/cmake/include/opennurbs_ext.h 2011-01-06 23:44:23 UTC
(rev 41998)
+++ brlcad/branches/cmake/include/opennurbs_ext.h 2011-01-06 23:53:54 UTC
(rev 41999)
@@ -32,18 +32,6 @@
#include <iostream>
#include "vmath.h"
-#ifndef RT_EXPORT
-# if defined(_WIN32) && !defined(__CYGWIN__) && defined(BRLCAD_DLL)
-# ifdef RT_EXPORT_DLL
-# define RT_EXPORT __declspec(dllexport)
-# else
-# define RT_EXPORT __declspec(dllimport)
-# endif
-# else
-# define RT_EXPORT
-# endif
-#endif
-
/* These definitions were added to opennurbs_curve.h - they are
* extensions of openNURBS, so add them here instead. At some
* point a more coherent structure should probably be set up for
@@ -1497,11 +1485,11 @@
* 3. If the curve is a line or an arc (determined with openNURBS routines),
* return the appropriate ON_Curve subclass (otherwise, return an
ON_NurbsCurve).
*/
-RT_EXPORT BU_EXTERN(ON_Curve* pullback_curve, (ON_BrepFace* face,
+extern ON_Curve* pullback_curve(ON_BrepFace* face,
const ON_Curve* curve,
SurfaceTree* tree = NULL,
double tolerance = BREP_FCP_ROOT_EPSILON,
- double flatness = 1.0e-3));
+ double flatness = 1.0e-3);
}
Modified: brlcad/branches/cmake/src/libfft/fft.h
===================================================================
--- brlcad/branches/cmake/src/libfft/fft.h 2011-01-06 23:44:23 UTC (rev
41998)
+++ brlcad/branches/cmake/src/libfft/fft.h 2011-01-06 23:53:54 UTC (rev
41999)
@@ -47,8 +47,8 @@
# endif
#endif
-FFT_EXPORT BU_EXTERN(void splitdit, (int N, int M));
-FFT_EXPORT BU_EXTERN(void ditsplit, (int n /* length */, int m /* n = 2^m */));
+FFT_EXPORT extern void splitdit(int N, int M);
+FFT_EXPORT extern void ditsplit(int n /* length */, int m /* n = 2^m */);
/*
* Local Variables:
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Learn how Oracle Real Application Clusters (RAC) One Node allows customers
to consolidate database storage, standardize their database environment, and,
should the need arise, upgrade to a full multi-node Oracle RAC database
without downtime or disruption
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
