Revision: 49042
http://brlcad.svn.sourceforge.net/brlcad/?rev=49042&view=rev
Author: erikgreenwald
Date: 2012-01-24 18:33:20 +0000 (Tue, 24 Jan 2012)
Log Message:
-----------
use GCV_EXPORT instead of local custom name.
Modified Paths:
--------------
brlcad/trunk/src/libgcv/soup.h
brlcad/trunk/src/libgcv/tri_intersect.c
Modified: brlcad/trunk/src/libgcv/soup.h
===================================================================
--- brlcad/trunk/src/libgcv/soup.h 2012-01-24 18:28:12 UTC (rev 49041)
+++ brlcad/trunk/src/libgcv/soup.h 2012-01-24 18:33:20 UTC (rev 49042)
@@ -24,18 +24,6 @@
*
*/
-#ifndef BOTTESS_EXPORT
-# if defined(BOTTESS_DLL_EXPORTS) && defined(BOTTESS_DLL_IMPORTS)
-# error "Only BOTTESS_DLL_EXPORTS or BOTTESS_DLL_IMPORTS can be defined,
not both."
-# elif defined(BOTTESS_DLL_EXPORTS)
-# define BOTTESS_EXPORT __declspec(dllexport)
-# elif defined(BOTTESS_DLL_IMPORTS)
-# define BOTTESS_EXPORT __declspec(dllimport)
-# else
-# define BOTTESS_EXPORT
-# endif
-#endif
-
/* hijack the top four bits of mode. For these operations, the mode should
* necessarily be 0x02 */
#define INSIDE 0x01
@@ -59,9 +47,10 @@
unsigned long int nfaces, maxfaces;
};
-BOTTESS_EXPORT int soup_add_face(struct soup_s *s, point_t a, point_t b,
point_t c, const struct bn_tol *tol);
-BOTTESS_EXPORT int split_face_single(struct soup_s *s, unsigned long int fid,
point_t isectpt[2], struct face_s *opp_face, const struct bn_tol *tol);
-BOTTESS_EXPORT int split_face(struct soup_s *left, unsigned long int
left_face, struct soup_s *right, unsigned long int right_face, const struct
bn_tol *tol);
+GCV_EXPORT int soup_add_face(struct soup_s *s, point_t a, point_t b, point_t
c, const struct bn_tol *tol);
+GCV_EXPORT int split_face_single(struct soup_s *s, unsigned long int fid,
point_t isectpt[2], struct face_s *opp_face, const struct bn_tol *tol);
+GCV_EXPORT int split_face(struct soup_s *left, unsigned long int left_face,
struct soup_s *right, unsigned long int right_face, const struct bn_tol *tol);
+GCV_EXPORT int gcv_tri_tri_intersect_with_isectline(struct soup_s *left,
struct soup_s *right, struct face_s *lf, struct face_s *rf, int *coplanar,
point_t *isectpt, const struct bn_tol *tol);
/*
* Local Variables:
Modified: brlcad/trunk/src/libgcv/tri_intersect.c
===================================================================
--- brlcad/trunk/src/libgcv/tri_intersect.c 2012-01-24 18:28:12 UTC (rev
49041)
+++ brlcad/trunk/src/libgcv/tri_intersect.c 2012-01-24 18:33:20 UTC (rev
49042)
@@ -30,6 +30,7 @@
#include "vmath.h"
#include "bn.h"
+#include "gcv.h"
#include "soup.h"
#include "tri_intersect.h"
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Keep Your Developer Skills Current with LearnDevNow!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-d2d
_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
