[Liblas-commits] hg-main-tree: fix busted merge

[liblas-commits at liblas.org]

details:   http://hg.libpc.orghg-main-tree/rev/887d425beaba
changeset: 620:887d425beaba
user:      Michael P. Gerlek <mpg at flaxen.com>
date:      Fri Apr 22 08:58:19 2011 -0700
description:
fix busted merge

diffstat:

 include/libpc/Utils.hpp    |  8 +++++---
 src/drivers/oci/Reader.cpp |  1 +
 2 files changed, 6 insertions(+), 3 deletions(-)

diffs (30 lines):

diff -r ef67b7003c76 -r 887d425beaba include/libpc/Utils.hpp
--- a/include/libpc/Utils.hpp	Fri Apr 22 08:47:39 2011 -0700
+++ b/include/libpc/Utils.hpp	Fri Apr 22 08:58:19 2011 -0700
@@ -194,10 +194,12 @@
 
 
 #ifdef LIBPC_COMPILER_MSVC
-#define compare_no_case(a,b,n)  _strnicmp( (a), (b), (n) )
+#define compare_no_case_n(a,b,n) _strnicmp( (a), (b), (n) )
+#define compare_no_case(a, b) _stricmp( (a), (b) )
 #else
-#define compare_no_case(a,b,n)  strncasecmp( (a), (b), (n) )
-#endif
+#define compare_no_case_n(a,b,n) strncasecmp( (a), (b), (n) )
+#define compare_no_case(a, b) strcasecmp( (a), (b) )
+#endif 
 
 
 } // namespace libpc
diff -r ef67b7003c76 -r 887d425beaba src/drivers/oci/Reader.cpp
--- a/src/drivers/oci/Reader.cpp	Fri Apr 22 08:47:39 2011 -0700
+++ b/src/drivers/oci/Reader.cpp	Fri Apr 22 08:58:19 2011 -0700
@@ -34,6 +34,7 @@
 
 #include <libpc/drivers/oci/Reader.hpp>
 #include <libpc/drivers/oci/Iterator.hpp>
+#include <libpc/Utils.hpp>
 
 #include <libpc/exceptions.hpp>