From 01b6173974fa9c13cc0e51fe014c5a8be06c9966 Mon Sep 17 00:00:00 2001 From: Popa Marius Adrian Date: Fri, 11 Apr 2014 16:47:54 +0300 Subject: [PATCH 1/3] ran fromdos on it fixes #24 --- binding.gyp | 58 ++++++++++++++++++++++++++--------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/binding.gyp b/binding.gyp index 6f632d5..c707c8c 100644 --- a/binding.gyp +++ b/binding.gyp @@ -1,29 +1,29 @@ -{ - 'targets': [ - { - 'target_name': 'binding', - 'sources': [ './src/fb-bindings.cc', './src/fb-bindings-blob.cc', - './src/fb-bindings-fbresult.cc', - './src/fb-bindings-connection.cc','./src/fb-bindings-eventblock.cc', - './src/fb-bindings-fbeventemitter.cc', - './src/fb-bindings-statement.cc' ], - 'include_dirs': [ - '<(module_root_dir)/fb/include' - ], - "conditions" : [ - [ - 'OS=="linux"', { - 'libraries': [ '-lfbclient' ] - } - ], - [ - 'OS=="win"', { - "libraries" : [ - '<(module_root_dir)/fb/lib/fbclient_ms.lib' - ] - } - ] - ] - } - ] -} +{ + 'targets': [ + { + 'target_name': 'binding', + 'sources': [ './src/fb-bindings.cc', './src/fb-bindings-blob.cc', + './src/fb-bindings-fbresult.cc', + './src/fb-bindings-connection.cc','./src/fb-bindings-eventblock.cc', + './src/fb-bindings-fbeventemitter.cc', + './src/fb-bindings-statement.cc' ], + 'include_dirs': [ + '<(module_root_dir)/fb/include' + ], + "conditions" : [ + [ + 'OS=="linux"', { + 'libraries': [ '-lfbclient' ] + } + ], + [ + 'OS=="win"', { + "libraries" : [ + '<(module_root_dir)/fb/lib/fbclient_ms.lib' + ] + } + ] + ] + } + ] +} From 562ac207b5b6583a2981e1d165b40484230c8972 Mon Sep 17 00:00:00 2001 From: Popa Marius Adrian Date: Fri, 11 Apr 2014 17:01:39 +0300 Subject: [PATCH 2/3] =?UTF-8?q?fix=20warning:=20unused=20variable=20?= =?UTF-8?q?=E2=80=98i=E2=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/fb-bindings-fbresult.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/fb-bindings-fbresult.cc b/src/fb-bindings-fbresult.cc index 2f67a58..1461c9b 100644 --- a/src/fb-bindings-fbresult.cc +++ b/src/fb-bindings-fbresult.cc @@ -113,9 +113,8 @@ Handle void FBResult::clean_sqlda(XSQLDA *sqlda) { - int i; XSQLVAR* var; - for(i = 0, var= sqlda->sqlvar; i < sqlda->sqld;i++,var++) + for(int i = 0, var= sqlda->sqlvar; i < sqlda->sqld;i++,var++) { switch(var->sqltype & ~1) { From 8e8143e09676bde0828418771cd1f30a158dd6b4 Mon Sep 17 00:00:00 2001 From: Popa Marius Adrian Date: Fri, 11 Apr 2014 17:10:08 +0300 Subject: [PATCH 3/3] =?UTF-8?q?Revert=20"fix=20warning:=20unused=20variabl?= =?UTF-8?q?e=20=E2=80=98i=E2=80=99"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 562ac207b5b6583a2981e1d165b40484230c8972. --- src/fb-bindings-fbresult.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/fb-bindings-fbresult.cc b/src/fb-bindings-fbresult.cc index 1461c9b..2f67a58 100644 --- a/src/fb-bindings-fbresult.cc +++ b/src/fb-bindings-fbresult.cc @@ -113,8 +113,9 @@ Handle void FBResult::clean_sqlda(XSQLDA *sqlda) { + int i; XSQLVAR* var; - for(int i = 0, var= sqlda->sqlvar; i < sqlda->sqld;i++,var++) + for(i = 0, var= sqlda->sqlvar; i < sqlda->sqld;i++,var++) { switch(var->sqltype & ~1) {