bk commit - MyODBC 3.51 (1.348)

Below is the list of changes that have just been commited into a local
MyODBC 3.51 repository of 'pharvey'. When 'pharvey' does a push, they will
be propogaged to the main repository and within 2 hours after the push
into the public repository. 

For more information on how to access the public repository see:
http://www.mysql.com/products/myodbc/faq_2.html#Development_source

You can also browse the changes from public repository:
Complete repository: http://mysql.bkbits.net:8080/myodbc3/
This changeset     : http://mysql.bkbits.net:8080/myodbc3/cset@xxxxx

ChangeSet
  1.348 04/08/05 18:31:30 peterh@xxxxxxxxx +5 -0
  testing concept on osx

  setup/setup.pro
    1.2 04/08/05 18:31:29 peterh@xxxxxxxxx +5 -2
    testing concept on osx

  setup/MYODBCSetupGetAttributesParsed.c
    1.2 04/08/05 18:31:29 peterh@xxxxxxxxx +22 -0
    testing concept on osx

  setup/MYODBCSetup.h
    1.2 04/08/05 18:31:29 peterh@xxxxxxxxx +11 -0
    testing concept on osx

  myodbcinst/myodbcinst.c
    1.11 04/08/05 18:31:29 peterh@xxxxxxxxx +2 -1
    testing concept on osx

  myodbcinst/Makefile.osx
    1.3 04/08/05 18:31:29 peterh@xxxxxxxxx +1 -1
    testing concept on osx

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: peterh
# Host: peter-harveys-computer.local
# Root: /Users/pharvey/SandBox/MySQL/myodbc-3.51

--- 1.10/myodbcinst/myodbcinst.c        2004-08-05 16:21:36 -07:00
+++ 1.11/myodbcinst/myodbcinst.c        2004-08-05 18:31:29 -07:00
@@ -23,6 +23,7 @@
 
 #ifdef _OSX_
   #include <iodbcinst.h>
+  #include <ltdl.h>
 #endif
 
 #ifdef _UNIX_
@@ -142,7 +143,7 @@
               but path seems needed for iodbc. The implication is that
               the driver *must* be installed in /usr/lib for this to work.
     */
-    if ( !SQLInstallDriverEx( "MySQL ODBC 3.51 
Driver\0Driver=/usr/local/lib/libmyodbc3_r.dylib\0Setup=/usr/local/lib/libmyodbc3_r.dylib\0\0",
 0, szLoc, 1023, &nLocLen, ODBC_INSTALL_COMPLETE, &nUsageCount ) )
+    if ( !SQLInstallDriverEx( "MySQL ODBC 3.51 
Driver\0Driver=/usr/local/lib/libmyodbc3_r.dylib\0Setup=/usr/local/lib/libmyodbc3S.dylib\0\0",
 0, szLoc, 1023, &nLocLen, ODBC_INSTALL_COMPLETE, &nUsageCount ) )
     {
         doInstallerError();
         fprintf( stderr, "[%s][%d][ERROR] Failed to register driver. The most 
likely reason for this is that you do not have write privs. to 
~/Library/ODBC/odbcinst.ini or that the files do not exist.\n", __FILE__, 
__LINE__ );

--- 1.1/setup/MYODBCSetup.h     2004-08-05 16:14:36 -07:00
+++ 1.2/setup/MYODBCSetup.h     2004-08-05 18:31:29 -07:00
@@ -1,13 +1,24 @@
 #ifndef MYODBCSETUP_H
 #define MYODBCSETUP_H
 
+#define _GNU_SOURCE
+
+#ifndef Q_WS_MACX
 #include <malloc.h>
+#endif
+
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
+#ifdef Q_WS_MACX
+#include <iodbcinst.h>
+#else
 #include <odbcinst.h>
+#include <sqlext.h>
+#endif
+
 #include <sqlext.h>
 
 #ifndef FALSE 

--- 1.1/setup/MYODBCSetupGetAttributesParsed.c  2004-08-05 16:14:25 -07:00
+++ 1.2/setup/MYODBCSetupGetAttributesParsed.c  2004-08-05 18:31:29 -07:00
@@ -16,6 +16,28 @@
   MYODBC_ATTR_PARSE_STATE_VALUE
   
 } MYODBC_ATTR_PARSE_STATE;
+
+#ifndef max
+#define max( a, b ) (((a) > (b)) ? (a) : (b))
+#endif
+
+#ifndef strndup
+char *strndup( const char *s, size_t n )
+{
+    size_t nAvail;
+    char *p;
+
+    if ( !s )
+        return 0;
+
+    nAvail = max( strlen(s) + 1, n + 1 );
+    p      = malloc( nAvail );
+    memcpy( p, s, nAvail );
+    p[nAvail] = '\0';
+
+    return p; 
+}
+#endif
  
 /*!
     \internal

--- 1.1/setup/setup.pro 2004-08-05 16:14:39 -07:00
+++ 1.2/setup/setup.pro 2004-08-05 18:31:29 -07:00
@@ -10,8 +10,11 @@
 OBJECTS_DIR             = .tmp
 LANGUAGE                = C++
 CPP_ALWAYS_CREATE_SOURCE = TRUE
-# CONFIG                  += qt dll warn_on
-CONFIG                  += qt dll thread warn_on
+CONFIG                  += qt dll warn_on
+# CONFIG                  += qt dll thread warn_on
+DEFINES                        += Q_WS_MACX
+
+mac:LIBS               += -liodbcinst
 
 # #########################################################
 # FILES

--- 1.2/myodbcinst/Makefile.osx 2004-08-04 08:28:00 -07:00
+++ 1.3/myodbcinst/Makefile.osx 2004-08-05 18:31:29 -07:00
@@ -1,6 +1,6 @@
 all:
        gcc -c myodbcinst.c -D_OSX_
-       gcc myodbcinst.o -o myodbcinst -L/usr/lib -liodbcinst
+       gcc myodbcinst.o -o myodbcinst -L/usr/lib -liodbcinst -lltdl
 
 clean:
        rm myodbcinst.o

-- 
MySQL ODBC Mailing List
For list archives: http://lists.mysql.com/myodbc
To unsubscribe:    http://lists.mysql.com/myodbc?unsub=gcdmo-myodbc@xxxxxxxxxxx