X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=db-mysql%2Fclsql_mysql.c;h=ebbb8e1e48e99f2b9ce6e2d9085c908637add086;hb=3d86a3b402ae495cddcc5999c5bdd7fe6f586d53;hp=d1bb084a7bf898eadab6a43683c89c9bd6d4dfd7;hpb=e3924d6e872f06dce33c923b15c5d30baa31460c;p=clsql.git

diff --git a/db-mysql/clsql_mysql.c b/db-mysql/clsql_mysql.c
index d1bb084..ebbb8e1 100644
--- a/db-mysql/clsql_mysql.c
+++ b/db-mysql/clsql_mysql.c
@@ -6,8 +6,6 @@
  *   Programmer:    Kevin M. Rosenberg
  *   Date Started:  Mar 2002
  *
- * $Id$
- *
  * This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
  *
  * CLSQL users are granted the rights to distribute and use this software
@@ -15,19 +13,19 @@
  * (http://opensource.franz.com/preamble.html), also known as the LLGPL.
  ***************************************************************************/
 
-#ifdef WIN32
+#if defined(WIN32)||defined(WIN64)
 #include <windows.h>
 
 BOOL WINAPI DllEntryPoint(HINSTANCE hinstdll, DWORD fdwReason,
-			  LPVOID lpvReserved)
+                          LPVOID lpvReserved)
 {
         return 1;
 }
-       
+
 #define DLLEXPORT __declspec(dllexport)
 
 #else
-#define DLLEXPORT 
+#define DLLEXPORT
 #endif
 
 
@@ -37,19 +35,19 @@ BOOL WINAPI DllEntryPoint(HINSTANCE hinstdll, DWORD fdwReason,
 DLLEXPORT
 void
 clsql_mysql_data_seek (MYSQL_RES* res, unsigned int offset_high32,
-		       unsigned int offset_low32)
+                       unsigned int offset_low32)
 {
   my_ulonglong offset;
 
   offset = offset_high32;
   offset = offset << 32;
   offset += offset_low32;
-  
+
   mysql_data_seek (res, offset);
 }
 
 /* The following functions are used to return 64-bit integers to Lisp.
-   They return the 32-bit low part and store in upper 32-bits in a 
+   They return the 32-bit low part and store in upper 32-bits in a
    located sent via a pointer */
 
 static const unsigned int bitmask_32bits = 0xFFFFFFFF;
@@ -87,7 +85,15 @@ clsql_mysql_insert_id (MYSQL* mysql, unsigned int* pHigh32)
 /* Accessor functions to hide the differences across MySQL versions */
 
 DLLEXPORT
-short int
+unsigned int
+clsql_mysql_field_flags (MYSQL_FIELD* field)
+{
+  return field->flags;
+}
+
+
+DLLEXPORT
+unsigned int
 clsql_mysql_field_type (MYSQL_FIELD* field)
 {
   return field->type;
@@ -127,8 +133,8 @@ allocate_bind (unsigned int n)
 
 DLLEXPORT
 void
-bind_param (MYSQL_BIND bind[], unsigned int n, unsigned long length, unsigned short is_null, 
-	   void* buffer, unsigned short buffer_type, unsigned long buffer_length)
+bind_param (MYSQL_BIND bind[], unsigned int n, unsigned long length, unsigned short is_null,
+           void* buffer, unsigned short buffer_type, unsigned long buffer_length)
 {
   *bind[n].length = length;
   *bind[n].is_null = is_null;
@@ -138,7 +144,6 @@ bind_param (MYSQL_BIND bind[], unsigned int n, unsigned long length, unsigned sh
 }
 
 
-DLLEXPORT
 DLLEXPORT
 unsigned int
 clsql_mysql_stmt_affected_rows (MYSQL_STMT* stmt, unsigned int* pHigh32)
@@ -148,6 +153,5 @@ clsql_mysql_stmt_affected_rows (MYSQL_STMT* stmt, unsigned int* pHigh32)
   return lower_32bits(nAffected);
 }
 
-
 #endif