lucy-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nwelln...@apache.org
Subject [lucy-commits] [3/3] git commit: refs/heads/cfc-tests - Fix _scprintf detection on Windows
Date Sun, 03 Feb 2013 20:52:24 GMT
Updated Branches:
  refs/heads/cfc-tests b2f38681e -> 140fc3ec0


Fix _scprintf detection on Windows


Project: http://git-wip-us.apache.org/repos/asf/lucy/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/140fc3ec
Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/140fc3ec
Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/140fc3ec

Branch: refs/heads/cfc-tests
Commit: 140fc3ec0914f5cf592146318d668d1357ce2a41
Parents: d3fa1f8
Author: Nick Wellnhofer <wellnhofer@aevum.de>
Authored: Sun Feb 3 21:43:27 2013 +0100
Committer: Nick Wellnhofer <wellnhofer@aevum.de>
Committed: Sun Feb 3 21:49:59 2013 +0100

----------------------------------------------------------------------
 charmonizer/src/Charmonizer/Probe/Strings.c |    8 ++++++--
 clownfish/compiler/common/charmonizer.c     |    8 ++++++--
 clownfish/runtime/common/charmonizer.c      |    8 ++++++--
 common/charmonizer.c                        |    8 ++++++--
 4 files changed, 24 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucy/blob/140fc3ec/charmonizer/src/Charmonizer/Probe/Strings.c
----------------------------------------------------------------------
diff --git a/charmonizer/src/Charmonizer/Probe/Strings.c b/charmonizer/src/Charmonizer/Probe/Strings.c
index dabe9e2..9a1a288 100644
--- a/charmonizer/src/Charmonizer/Probe/Strings.c
+++ b/charmonizer/src/Charmonizer/Probe/Strings.c
@@ -79,11 +79,15 @@ chaz_Strings_probe_c99_snprintf(void) {
 
     /* Test for _scprintf and _snprintf found in the MSVCRT.
      */
-    if (chaz_CC_test_compile(detect__scprintf_code)) {
+    output = chaz_CC_capture_output(detect__scprintf_code, &output_len);
+    if (output != NULL) {
         chaz_ConfWriter_add_def("HAS__SCPRINTF", NULL);
+        free(output);
     }
-    if (chaz_CC_test_compile(detect__snprintf_code)) {
+    output = chaz_CC_capture_output(detect__snprintf_code, &output_len);
+    if (output != NULL) {
         chaz_ConfWriter_add_def("HAS__SNPRINTF", NULL);
+        free(output);
     }
 }
 

http://git-wip-us.apache.org/repos/asf/lucy/blob/140fc3ec/clownfish/compiler/common/charmonizer.c
----------------------------------------------------------------------
diff --git a/clownfish/compiler/common/charmonizer.c b/clownfish/compiler/common/charmonizer.c
index b691c4f..5767750 100644
--- a/clownfish/compiler/common/charmonizer.c
+++ b/clownfish/compiler/common/charmonizer.c
@@ -3649,11 +3649,15 @@ chaz_Strings_probe_c99_snprintf(void) {
 
     /* Test for _scprintf and _snprintf found in the MSVCRT.
      */
-    if (chaz_CC_test_compile(detect__scprintf_code)) {
+    output = chaz_CC_capture_output(detect__scprintf_code, &output_len);
+    if (output != NULL) {
         chaz_ConfWriter_add_def("HAS__SCPRINTF", NULL);
+        free(output);
     }
-    if (chaz_CC_test_compile(detect__snprintf_code)) {
+    output = chaz_CC_capture_output(detect__snprintf_code, &output_len);
+    if (output != NULL) {
         chaz_ConfWriter_add_def("HAS__SNPRINTF", NULL);
+        free(output);
     }
 }
 

http://git-wip-us.apache.org/repos/asf/lucy/blob/140fc3ec/clownfish/runtime/common/charmonizer.c
----------------------------------------------------------------------
diff --git a/clownfish/runtime/common/charmonizer.c b/clownfish/runtime/common/charmonizer.c
index 7f7178d..fa9db46 100644
--- a/clownfish/runtime/common/charmonizer.c
+++ b/clownfish/runtime/common/charmonizer.c
@@ -4665,11 +4665,15 @@ chaz_Strings_probe_c99_snprintf(void) {
 
     /* Test for _scprintf and _snprintf found in the MSVCRT.
      */
-    if (chaz_CC_test_compile(detect__scprintf_code)) {
+    output = chaz_CC_capture_output(detect__scprintf_code, &output_len);
+    if (output != NULL) {
         chaz_ConfWriter_add_def("HAS__SCPRINTF", NULL);
+        free(output);
     }
-    if (chaz_CC_test_compile(detect__snprintf_code)) {
+    output = chaz_CC_capture_output(detect__snprintf_code, &output_len);
+    if (output != NULL) {
         chaz_ConfWriter_add_def("HAS__SNPRINTF", NULL);
+        free(output);
     }
 }
 

http://git-wip-us.apache.org/repos/asf/lucy/blob/140fc3ec/common/charmonizer.c
----------------------------------------------------------------------
diff --git a/common/charmonizer.c b/common/charmonizer.c
index 84a5341..0e22822 100644
--- a/common/charmonizer.c
+++ b/common/charmonizer.c
@@ -4665,11 +4665,15 @@ chaz_Strings_probe_c99_snprintf(void) {
 
     /* Test for _scprintf and _snprintf found in the MSVCRT.
      */
-    if (chaz_CC_test_compile(detect__scprintf_code)) {
+    output = chaz_CC_capture_output(detect__scprintf_code, &output_len);
+    if (output != NULL) {
         chaz_ConfWriter_add_def("HAS__SCPRINTF", NULL);
+        free(output);
     }
-    if (chaz_CC_test_compile(detect__snprintf_code)) {
+    output = chaz_CC_capture_output(detect__snprintf_code, &output_len);
+    if (output != NULL) {
         chaz_ConfWriter_add_def("HAS__SNPRINTF", NULL);
+        free(output);
     }
 }
 


Mime
View raw message