Browse Source

db_unixodbc: renamed files with reserved name on some oses

Daniel-Constantin Mierla 12 years ago
parent
commit
c6819b9a02

+ 1 - 1
modules/db_unixodbc/con.c → modules/db_unixodbc/connection.c

@@ -31,7 +31,7 @@
  *  2006-05-05  extract_error passes back last error state on return (sgupta)
  *  2006-05-05  extract_error passes back last error state on return (sgupta)
  */
  */
 
 
-#include "con.h"
+#include "connection.h"
 #include "../../mem/mem.h"
 #include "../../mem/mem.h"
 #include "../../dprint.h"
 #include "../../dprint.h"
 #include "../../ut.h"
 #include "../../ut.h"

+ 0 - 0
modules/db_unixodbc/con.h → modules/db_unixodbc/connection.h


+ 1 - 1
modules/db_unixodbc/dbase.c

@@ -38,7 +38,7 @@
 #include "../../dprint.h"
 #include "../../dprint.h"
 #include "../../lib/srdb1/db_query.h"
 #include "../../lib/srdb1/db_query.h"
 #include "val.h"
 #include "val.h"
-#include "con.h"
+#include "connnection.h"
 #include "row.h"
 #include "row.h"
 #include "res.h"
 #include "res.h"
 #include "list.h"
 #include "list.h"

+ 1 - 1
modules/db_unixodbc/list.h

@@ -35,7 +35,7 @@
 
 
 #include <stdio.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdlib.h>
-#include "con.h"
+#include "connection.h"
 
 
 
 
 typedef struct list
 typedef struct list

+ 1 - 1
modules/db_unixodbc/res.c

@@ -34,7 +34,7 @@
 #include "../../dprint.h"
 #include "../../dprint.h"
 #include "row.h"
 #include "row.h"
 #include "../../lib/srdb1/db_res.h"
 #include "../../lib/srdb1/db_res.h"
-#include "con.h"
+#include "connection.h"
 #include "res.h"
 #include "res.h"
 #include "list.h"
 #include "list.h"
 #include <stdlib.h>
 #include <stdlib.h>

+ 1 - 1
modules/db_unixodbc/row.c

@@ -35,7 +35,7 @@
 #include "../../lib/srdb1/db_val.h"
 #include "../../lib/srdb1/db_val.h"
 #include "val.h"
 #include "val.h"
 #include "row.h"
 #include "row.h"
-#include "con.h"
+#include "connection.h"
 
 
 /*
 /*
  * Convert a row from result into db API representation
  * Convert a row from result into db API representation

+ 1 - 1
modules/db_unixodbc/val.c

@@ -34,7 +34,7 @@
 #include "../../lib/srdb1/db_ut.h"
 #include "../../lib/srdb1/db_ut.h"
 #include "db_unixodbc.h"
 #include "db_unixodbc.h"
 #include "val.h"
 #include "val.h"
-#include "con.h"
+#include "connection.h"
 
 
 /*
 /*
  * Used when converting the query to a result
  * Used when converting the query to a result