[lucy-commits] svn commit: r1332252 - in /lucy/trunk/perl/xs: XSBind.c XSBind.h

[nw...@apache.org]

Author: nwellnhof
Date: Mon Apr 30 15:42:06 2012
New Revision: 1332252

URL: http://svn.apache.org/viewvc?rev=1332252&view=rev
Log:
Interim fix for XSBIND_EXTERN

The old approach was flawed, because C_CFISH_XSBIND was only defined in
XSBind.c. Other files that include XSBind.h ended up using CHY_IMPORT
which breaks the build with GCC on Windows.

The current approach works because functions don't strictly need
__declspec(dllimport). A better solution might be to use a macro that
is always defined during the Lucy build.

Modified:
    lucy/trunk/perl/xs/XSBind.c
    lucy/trunk/perl/xs/XSBind.h

Modified: lucy/trunk/perl/xs/XSBind.c
URL: http://svn.apache.org/viewvc/lucy/trunk/perl/xs/XSBind.c?rev=1332252&r1=1332251&r2=1332252&view=diff
==============================================================================
--- lucy/trunk/perl/xs/XSBind.c (original)
+++ lucy/trunk/perl/xs/XSBind.c Mon Apr 30 15:42:06 2012
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-#define C_CFISH_XSBIND
 #define C_LUCY_OBJ
 #define NEED_newRV_noinc
 #include "XSBind.h"

Modified: lucy/trunk/perl/xs/XSBind.h
URL: http://svn.apache.org/viewvc/lucy/trunk/perl/xs/XSBind.h?rev=1332252&r1=1332251&r2=1332252&view=diff
==============================================================================
--- lucy/trunk/perl/xs/XSBind.h (original)
+++ lucy/trunk/perl/xs/XSBind.h Mon Apr 30 15:42:06 2012
@@ -41,11 +41,7 @@ extern "C" {
 #define NEED_newRV_noinc_GLOBAL
 #include "ppport.h"
 
-#ifdef C_CFISH_XSBIND
 #define XSBIND_EXTERN CHY_EXPORT
-#else
-#define XSBIND_EXTERN CHY_IMPORT
-#endif
 
 /** Given either a class name or a perl object, manufacture a new Clownfish
  * object suitable for supplying to a cfish_Foo_init() function.