Fix a compatibility issue caused but _res macro definition

Some public header defines _res macro (resolv.h header on some Linux). For compatibility reasons in sybdb.h (which is installed) we just undefine the offending macro. Signed-off-by: Frediano Ziglio <freddy77@gmail.com>
FreeTDS · Aug 9, 2017 · 39d90a9 · 39d90a9
1 parent 86fd7ec
commit 39d90a9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/include/freetds/tds.h b/include/freetds/tds.h
@@ -139,7 +139,7 @@ typedef struct
 	TDS_INT      date;	/**< date, 0 = 1900-01-01 */
 	TDS_SMALLINT offset;	/**< time offset */
 	TDS_USMALLINT time_prec:3;
-	TDS_USMALLINT _res:10;
+	TDS_USMALLINT _tds_reserved:10;
 	TDS_USMALLINT has_time:1;
 	TDS_USMALLINT has_date:1;
 	TDS_USMALLINT has_offset:1;

diff --git a/include/sybdb.h b/include/sybdb.h
@@ -309,6 +309,8 @@ typedef struct
 	DBINT      date;	/**< date, 0 = 1900-01-01 */
 	DBSMALLINT offset;	/**< time offset */
 	DBUSMALLINT time_prec:3;
+// fix a problem with some public headers defining _res
+#undef _res
 	DBUSMALLINT _res:10;
 	DBUSMALLINT has_time:1;
 	DBUSMALLINT has_date:1;