Patch from Neil H.

[wxWidgets.git] / src / iodbc / dlproc.h

diff --git a/src/iodbc/dlproc.h b/src/iodbc/dlproc.h
index b757369a8b045bd62c83121c834f13c072cd94ef..663055599dfa0103ebcb671c42e4f7d8a1abd90d 100644 (file)
--- a/src/iodbc/dlproc.h
+++ b/src/iodbc/dlproc.h
@@ -1,39 +1,55 @@
-#ifndef _DLPROC_H
-# define        _DLPROC_H
-
-# include       <../iodbc/dlf.h>
-
-# ifdef OS2
-  typedef       RETCODE         (FAR* _System HPROC)();
-# else
-  typedef       RETCODE         (FAR* HPROC)();
-# endif
-
-# ifdef DLDAPI_SVR4_DLFCN
-#  include      <dlfcn.h>
-   typedef void*        HDLL;
-# endif
-
-# ifdef DLDAPI_HP_SHL
-#  include      <dl.h>
-   typedef shl_t        HDLL;
-# endif
-
-# ifdef DLDAPI_AIX_LOAD
-    typedef void*        HDLL;
-# endif
+/*
+ *  dlproc.h
+ *
+ *  $Id$
+ *
+ *  Load driver and resolve driver's function entry point
+ *
+ *  The iODBC driver manager.
+ *  
+ *  Copyright (C) 1995 by Ke Jin <kejin@empress.com> 
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Library General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Library General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Library General Public
+ *  License along with this library; if not, write to the Free
+ *  Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+#ifndef        _DLPROC_H
+#define        _DLPROC_H
+
+#include       "dlf.h"
+
+typedef RETCODE (FAR * HPROC) ();
+
+#ifdef DLDAPI_SVR4_DLFCN
+#include       <dlfcn.h>
+typedef void *HDLL;
+#endif
 
-# ifdef DLDAPI_OS2
-  typedef HMODULE      HDLL;
-# endif
+#ifdef DLDAPI_HP_SHL
+#include       <dl.h>
+typedef shl_t HDLL;
+#endif
 
-extern  HPROC           _iodbcdm_getproc();
-extern  HDLL            _iodbcdm_dllopen(char FAR* dll);
-extern  HPROC           _iodbcdm_dllproc(HDLL hdll, char FAR* sym);
-extern  char FAR*       _iodbcdm_dllerror();
-extern  int             _iodbcdm_dllclose(HDLL hdll);
+#if defined(DLDAPI_AIX_LOAD) || defined(__DECCXX)
+typedef void *HDLL;
+#endif
 
-#define SQL_NULL_HDLL   ((HDLL)NULL)
-#define SQL_NULL_HPROC  ((HPROC)NULL)
+extern HPROC _iodbcdm_getproc ();
+extern HDLL _iodbcdm_dllopen (char FAR * dll);
+extern HPROC _iodbcdm_dllproc (HDLL hdll, char FAR * sym);
+extern char FAR *_iodbcdm_dllerror ();
+extern int _iodbcdm_dllclose (HDLL hdll);
 
+#define        SQL_NULL_HDLL   ((HDLL)NULL)
+#define        SQL_NULL_HPROC  ((HPROC)NULL)
 #endif