diff --git a/druntime/src/core/sys/windows/sql.d b/druntime/src/core/sys/windows/sql.d index 9054ce589e8..013d9f06e60 100644 --- a/druntime/src/core/sys/windows/sql.d +++ b/druntime/src/core/sys/windows/sql.d @@ -11,13 +11,15 @@ $(RED Warning: */ module core.sys.windows.sql; + +enum ODBCVER = 0x0400; + +deprecated ("The ODBC 3.5 modules are deprecated. Please use the ODBC4 modules in the `etc.c.odbc` package."): version (Windows): public import core.sys.windows.sqltypes; import core.sys.windows.windef; -enum ODBCVER = 0x0351; - enum SQL_ACCESSIBLE_PROCEDURES=20; enum SQL_ACCESSIBLE_TABLES=19; enum SQL_ALL_TYPES=0; diff --git a/druntime/src/core/sys/windows/sqlext.d b/druntime/src/core/sys/windows/sqlext.d index b871fbbbb84..a53918394dc 100644 --- a/druntime/src/core/sys/windows/sqlext.d +++ b/druntime/src/core/sys/windows/sqlext.d @@ -11,6 +11,7 @@ $(RED Warning: */ module core.sys.windows.sqlext; +deprecated ("The ODBC 3.5 modules are deprecated. Please use the ODBC4 modules in the `etc.c.odbc` package."): version (Windows): /* Conversion notes: diff --git a/druntime/src/core/sys/windows/sqltypes.d b/druntime/src/core/sys/windows/sqltypes.d index 04fac6bac6a..ca91f015851 100644 --- a/druntime/src/core/sys/windows/sqltypes.d +++ b/druntime/src/core/sys/windows/sqltypes.d @@ -70,6 +70,10 @@ alias long ODBCINT64, SQLBIGINT; alias ulong SQLUBIGINT; //} +//Everything above this line may by used by odbcinst.d +//Everything below this line is deprecated +deprecated ("The ODBC 3.5 modules are deprecated. Please use the ODBC4 modules in the `etc.c.odbc` package."): + struct DATE_STRUCT { SQLSMALLINT year; SQLUSMALLINT month; diff --git a/druntime/src/core/sys/windows/sqlucode.d b/druntime/src/core/sys/windows/sqlucode.d index e7ae1d276be..d20952d5b4b 100644 --- a/druntime/src/core/sys/windows/sqlucode.d +++ b/druntime/src/core/sys/windows/sqlucode.d @@ -11,6 +11,7 @@ $(RED Warning: */ module core.sys.windows.sqlucode; +deprecated ("The ODBC 3.5 modules are deprecated. Please use the ODBC4 modules in the `etc.c.odbc` package."): version (Windows): version (ANSI) {} else version = Unicode;