[sr-dev] git:master: db_unixodbc: renamed files with reserved name on some oses

Daniel-Constantin Mierla miconda at gmail.com
Thu Jul 11 16:44:17 CEST 2013


Module: sip-router
Branch: master
Commit: c6819b9a02d59b3ad8640fbaaf2fc0b9ef3d5021
URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c6819b9a02d59b3ad8640fbaaf2fc0b9ef3d5021

Author: Daniel-Constantin Mierla <miconda at gmail.com>
Committer: Daniel-Constantin Mierla <miconda at gmail.com>
Date:   Thu Jul 11 16:43:31 2013 +0200

db_unixodbc: renamed files with reserved name on some oses

---

 modules/db_unixodbc/{con.c => connection.c} |    2 +-
 modules/db_unixodbc/{con.h => connection.h} |    0
 modules/db_unixodbc/dbase.c                 |    2 +-
 modules/db_unixodbc/list.h                  |    2 +-
 modules/db_unixodbc/res.c                   |    2 +-
 modules/db_unixodbc/row.c                   |    2 +-
 modules/db_unixodbc/val.c                   |    2 +-
 7 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/db_unixodbc/con.c b/modules/db_unixodbc/connection.c
similarity index 99%
rename from modules/db_unixodbc/con.c
rename to modules/db_unixodbc/connection.c
index d211d9e..902870e 100644
--- a/modules/db_unixodbc/con.c
+++ b/modules/db_unixodbc/connection.c
@@ -31,7 +31,7 @@
  *  2006-05-05  extract_error passes back last error state on return (sgupta)
  */
 
-#include "con.h"
+#include "connection.h"
 #include "../../mem/mem.h"
 #include "../../dprint.h"
 #include "../../ut.h"
diff --git a/modules/db_unixodbc/con.h b/modules/db_unixodbc/connection.h
similarity index 100%
rename from modules/db_unixodbc/con.h
rename to modules/db_unixodbc/connection.h
diff --git a/modules/db_unixodbc/dbase.c b/modules/db_unixodbc/dbase.c
index 72edf1e..44301d4 100644
--- a/modules/db_unixodbc/dbase.c
+++ b/modules/db_unixodbc/dbase.c
@@ -38,7 +38,7 @@
 #include "../../dprint.h"
 #include "../../lib/srdb1/db_query.h"
 #include "val.h"
-#include "con.h"
+#include "connnection.h"
 #include "row.h"
 #include "res.h"
 #include "list.h"
diff --git a/modules/db_unixodbc/list.h b/modules/db_unixodbc/list.h
index 100bae0..1ab737b 100644
--- a/modules/db_unixodbc/list.h
+++ b/modules/db_unixodbc/list.h
@@ -35,7 +35,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "con.h"
+#include "connection.h"
 
 
 typedef struct list
diff --git a/modules/db_unixodbc/res.c b/modules/db_unixodbc/res.c
index 592755a..c575d5a 100644
--- a/modules/db_unixodbc/res.c
+++ b/modules/db_unixodbc/res.c
@@ -34,7 +34,7 @@
 #include "../../dprint.h"
 #include "row.h"
 #include "../../lib/srdb1/db_res.h"
-#include "con.h"
+#include "connection.h"
 #include "res.h"
 #include "list.h"
 #include <stdlib.h>
diff --git a/modules/db_unixodbc/row.c b/modules/db_unixodbc/row.c
index 4b1e564..1134bbe 100644
--- a/modules/db_unixodbc/row.c
+++ b/modules/db_unixodbc/row.c
@@ -35,7 +35,7 @@
 #include "../../lib/srdb1/db_val.h"
 #include "val.h"
 #include "row.h"
-#include "con.h"
+#include "connection.h"
 
 /*
  * Convert a row from result into db API representation
diff --git a/modules/db_unixodbc/val.c b/modules/db_unixodbc/val.c
index c2b26cd..a6e21b9 100644
--- a/modules/db_unixodbc/val.c
+++ b/modules/db_unixodbc/val.c
@@ -34,7 +34,7 @@
 #include "../../lib/srdb1/db_ut.h"
 #include "db_unixodbc.h"
 #include "val.h"
-#include "con.h"
+#include "connection.h"
 
 /*
  * Used when converting the query to a result




More information about the sr-dev mailing list