Tag: cws_ood680_os2port01 User: ydario Date: 2006/12/28 06:53:28 Modified: dba/connectivity/qa/connectivity/tools/makefile.mk dba/connectivity/source/inc/odbc/OFunctiondefs.hxx
Log: OS/2 initial import. File Changes: Directory: /dba/connectivity/qa/connectivity/tools/ =================================================== File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/connectivity/qa/connectivity/tools/makefile.mk?r1=1.3&r2=1.3.130.1 Delta lines: +9 -3 ------------------- --- makefile.mk 4 May 2006 09:24:25 -0000 1.3 +++ makefile.mk 28 Dec 2006 14:53:25 -0000 1.3.130.1 @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.3 $ +# $Revision: 1.3.130.1 $ # -# last change: $Author: rt $ $Date: 2006/05/04 09:24:25 $ +# last change: $Author: ydario $ $Date: 2006/12/28 14:53:25 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -41,6 +41,10 @@ # --- Settings ----------------------------------------------------- .INCLUDE: settings.mk +.IF "$(SOLAR_JAVA)" == "" +all: + @echo "Java not available. Build skipped" +.ELSE #----- compile .java files ----------------------------------------- @@ -65,5 +69,7 @@ .ELSE ALL: ALLDEP .ENDIF + +.ENDIF # "$(SOLAR_JAVA)" == "" .INCLUDE : target.mk Directory: /dba/connectivity/source/inc/odbc/ ============================================= File [changed]: OFunctiondefs.hxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/inc/odbc/OFunctiondefs.hxx?r1=1.12&r2=1.12.110.1 Delta lines: +9 -3 ------------------- --- OFunctiondefs.hxx 20 Jun 2006 02:05:55 -0000 1.12 +++ OFunctiondefs.hxx 28 Dec 2006 14:53:25 -0000 1.12.110.1 @@ -4,9 +4,9 @@ * * $RCSfile: OFunctiondefs.hxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.12.110.1 $ * - * last change: $Author: hr $ $Date: 2006/06/20 02:05:55 $ + * last change: $Author: ydario $ $Date: 2006/12/28 14:53:25 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -74,6 +74,12 @@ //-------------------------------------------------------------------------- #ifdef OS2 +#include <svpm.h> +#include <odbc/sqlext.h> +#define SDB_ODBC_CHAR UCHAR +#endif // OS2 + +#ifdef OS2__00 #ifdef ODBCIMP --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
