From 31fcd61401bf313cbc68cffda9a22a4bd11ebccf Mon Sep 17 00:00:00 2001 From: Jocelyn Fiat Date: Wed, 14 May 2014 10:14:51 +0200 Subject: [PATCH 1/3] Make sure to be able to compile in complete void-safe for 14.05 and still compile with 13.11 --- .../library/network/server/nino/nino-safe.ecf | 2 +- .../text/parser/json/library/json-safe.ecf | 2 +- examples/restbucksCRUD/client/client-safe.ecf | 4 +-- examples/restbucksCRUD/restbucks-safe.ecf | 6 ++--- examples/upload_image/upload_image-safe.ecf | 9 +++---- .../network/http_client/http_client-safe.ecf | 2 +- .../content_negotiation/conneg-safe.ecf | 5 ++-- library/network/protocol/http/http-safe.ecf | 2 +- .../notification_email-safe.ecf | 4 +-- .../openid/consumer/demo/demo-safe.ecf | 14 +++++----- .../security/openid/consumer/openid-safe.ecf | 2 +- .../http_authorization-safe.ecf | 2 +- .../server/ewsgi/connectors/cgi/cgi-safe.ecf | 2 +- .../ewsgi/connectors/nino/nino-safe.ecf | 2 +- library/server/ewsgi/ewsgi-safe.ecf | 2 +- library/server/ewsgi/ewsgi_spec-safe.ecf | 2 +- .../ewsgi/examples/hello_world/hello-safe.ecf | 2 +- library/server/libfcgi/libfcgi-safe.ecf | 6 ++--- library/server/wsf/connector/all-safe.ecf | 27 +++++++++---------- library/server/wsf/connector/nino-safe.ecf | 2 +- .../server/wsf/connector/openshift-safe.ecf | 8 +++--- library/server/wsf/default/cgi-safe.ecf | 2 +- library/server/wsf/default/nino-safe.ecf | 2 +- library/server/wsf/default/openshift-safe.ecf | 11 ++++---- library/server/wsf/wsf-safe.ecf | 2 +- library/text/encoder/encoder-safe.ecf | 2 +- tests/all-stable-safe.ecf | 2 +- tools/ise_wizard/ewf_ise_wizard-safe.ecf | 2 +- 28 files changed, 64 insertions(+), 66 deletions(-) diff --git a/contrib/library/network/server/nino/nino-safe.ecf b/contrib/library/network/server/nino/nino-safe.ecf index 9a2d69e9..11e63dfd 100644 --- a/contrib/library/network/server/nino/nino-safe.ecf +++ b/contrib/library/network/server/nino/nino-safe.ecf @@ -1,5 +1,5 @@ - + diff --git a/contrib/library/text/parser/json/library/json-safe.ecf b/contrib/library/text/parser/json/library/json-safe.ecf index 0eb6cc52..d1936431 100644 --- a/contrib/library/text/parser/json/library/json-safe.ecf +++ b/contrib/library/text/parser/json/library/json-safe.ecf @@ -1,5 +1,5 @@ - + diff --git a/examples/restbucksCRUD/client/client-safe.ecf b/examples/restbucksCRUD/client/client-safe.ecf index 5c53670e..69acd23e 100644 --- a/examples/restbucksCRUD/client/client-safe.ecf +++ b/examples/restbucksCRUD/client/client-safe.ecf @@ -1,5 +1,5 @@ - + @@ -11,7 +11,7 @@ - + diff --git a/examples/restbucksCRUD/restbucks-safe.ecf b/examples/restbucksCRUD/restbucks-safe.ecf index fc40603b..626f0d5e 100644 --- a/examples/restbucksCRUD/restbucks-safe.ecf +++ b/examples/restbucksCRUD/restbucks-safe.ecf @@ -1,5 +1,5 @@ - + /EIFGENs$ @@ -29,7 +29,7 @@ - @@ -41,7 +41,7 @@ - diff --git a/examples/upload_image/upload_image-safe.ecf b/examples/upload_image/upload_image-safe.ecf index ba2e34de..66fb0fcc 100644 --- a/examples/upload_image/upload_image-safe.ecf +++ b/examples/upload_image/upload_image-safe.ecf @@ -1,5 +1,5 @@ - + @@ -20,11 +20,10 @@ - + - + - - + diff --git a/library/network/http_client/http_client-safe.ecf b/library/network/http_client/http_client-safe.ecf index 1c7091d1..041fabd1 100644 --- a/library/network/http_client/http_client-safe.ecf +++ b/library/network/http_client/http_client-safe.ecf @@ -1,5 +1,5 @@ - + diff --git a/library/network/protocol/content_negotiation/conneg-safe.ecf b/library/network/protocol/content_negotiation/conneg-safe.ecf index 2bb7d7b2..af7edc59 100644 --- a/library/network/protocol/content_negotiation/conneg-safe.ecf +++ b/library/network/protocol/content_negotiation/conneg-safe.ecf @@ -1,5 +1,5 @@ - + @@ -18,7 +18,6 @@ /implementation - + diff --git a/library/network/protocol/http/http-safe.ecf b/library/network/protocol/http/http-safe.ecf index 024bdb8c..4cffe316 100644 --- a/library/network/protocol/http/http-safe.ecf +++ b/library/network/protocol/http/http-safe.ecf @@ -1,5 +1,5 @@ - + diff --git a/library/runtime/process/notification_email/notification_email-safe.ecf b/library/runtime/process/notification_email/notification_email-safe.ecf index 8bf4ed88..01d95e0a 100644 --- a/library/runtime/process/notification_email/notification_email-safe.ecf +++ b/library/runtime/process/notification_email/notification_email-safe.ecf @@ -1,5 +1,5 @@ - + @@ -13,6 +13,6 @@ - + diff --git a/library/security/openid/consumer/demo/demo-safe.ecf b/library/security/openid/consumer/demo/demo-safe.ecf index 10bd0633..ac320d01 100644 --- a/library/security/openid/consumer/demo/demo-safe.ecf +++ b/library/security/openid/consumer/demo/demo-safe.ecf @@ -1,5 +1,5 @@ - + @@ -7,17 +7,17 @@ /CVS$ /.svn$ - - - - + + + - - + + diff --git a/library/security/openid/consumer/openid-safe.ecf b/library/security/openid/consumer/openid-safe.ecf index 059358e4..67c5f936 100644 --- a/library/security/openid/consumer/openid-safe.ecf +++ b/library/security/openid/consumer/openid-safe.ecf @@ -1,5 +1,5 @@ - + diff --git a/library/server/authentication/http_authorization/http_authorization-safe.ecf b/library/server/authentication/http_authorization/http_authorization-safe.ecf index e5282ae4..4f5f95a9 100644 --- a/library/server/authentication/http_authorization/http_authorization-safe.ecf +++ b/library/server/authentication/http_authorization/http_authorization-safe.ecf @@ -1,5 +1,5 @@ - + diff --git a/library/server/ewsgi/connectors/cgi/cgi-safe.ecf b/library/server/ewsgi/connectors/cgi/cgi-safe.ecf index ef1e2700..8d0eaded 100644 --- a/library/server/ewsgi/connectors/cgi/cgi-safe.ecf +++ b/library/server/ewsgi/connectors/cgi/cgi-safe.ecf @@ -1,5 +1,5 @@ - + diff --git a/library/server/ewsgi/connectors/nino/nino-safe.ecf b/library/server/ewsgi/connectors/nino/nino-safe.ecf index effbfebe..433154aa 100644 --- a/library/server/ewsgi/connectors/nino/nino-safe.ecf +++ b/library/server/ewsgi/connectors/nino/nino-safe.ecf @@ -1,5 +1,5 @@ - + diff --git a/library/server/ewsgi/ewsgi-safe.ecf b/library/server/ewsgi/ewsgi-safe.ecf index adeb8d5e..62bce7d7 100644 --- a/library/server/ewsgi/ewsgi-safe.ecf +++ b/library/server/ewsgi/ewsgi-safe.ecf @@ -1,5 +1,5 @@ - + diff --git a/library/server/ewsgi/ewsgi_spec-safe.ecf b/library/server/ewsgi/ewsgi_spec-safe.ecf index 32ac76f1..eaae9ddf 100644 --- a/library/server/ewsgi/ewsgi_spec-safe.ecf +++ b/library/server/ewsgi/ewsgi_spec-safe.ecf @@ -1,5 +1,5 @@ - + diff --git a/library/server/ewsgi/examples/hello_world/hello-safe.ecf b/library/server/ewsgi/examples/hello_world/hello-safe.ecf index a381ea19..8d992f5c 100644 --- a/library/server/ewsgi/examples/hello_world/hello-safe.ecf +++ b/library/server/ewsgi/examples/hello_world/hello-safe.ecf @@ -1,5 +1,5 @@ - + diff --git a/library/server/libfcgi/libfcgi-safe.ecf b/library/server/libfcgi/libfcgi-safe.ecf index 525ce69e..0ae6aede 100644 --- a/library/server/libfcgi/libfcgi-safe.ecf +++ b/library/server/libfcgi/libfcgi-safe.ecf @@ -1,5 +1,5 @@ - + @@ -46,16 +46,16 @@ /fake$ - /windows$ /mac$ + /windows$ + /linux$ /fake$ /windows$ - /linux$ diff --git a/library/server/wsf/connector/all-safe.ecf b/library/server/wsf/connector/all-safe.ecf index 11f19f8f..ad23f576 100644 --- a/library/server/wsf/connector/all-safe.ecf +++ b/library/server/wsf/connector/all-safe.ecf @@ -1,5 +1,5 @@ - + @@ -10,21 +10,20 @@ - - - - - - + + + + + + + - - - - - - - + + + + + diff --git a/library/server/wsf/connector/nino-safe.ecf b/library/server/wsf/connector/nino-safe.ecf index 75bd218a..a6bcb9e1 100644 --- a/library/server/wsf/connector/nino-safe.ecf +++ b/library/server/wsf/connector/nino-safe.ecf @@ -1,5 +1,5 @@ - + diff --git a/library/server/wsf/connector/openshift-safe.ecf b/library/server/wsf/connector/openshift-safe.ecf index 50e1a697..7bbb62cf 100644 --- a/library/server/wsf/connector/openshift-safe.ecf +++ b/library/server/wsf/connector/openshift-safe.ecf @@ -1,5 +1,5 @@ - + @@ -10,9 +10,9 @@ - - + + - + diff --git a/library/server/wsf/default/cgi-safe.ecf b/library/server/wsf/default/cgi-safe.ecf index 6034e626..8a6faae1 100644 --- a/library/server/wsf/default/cgi-safe.ecf +++ b/library/server/wsf/default/cgi-safe.ecf @@ -1,5 +1,5 @@ - + diff --git a/library/server/wsf/default/nino-safe.ecf b/library/server/wsf/default/nino-safe.ecf index 3d22d656..f9f0aa19 100644 --- a/library/server/wsf/default/nino-safe.ecf +++ b/library/server/wsf/default/nino-safe.ecf @@ -1,5 +1,5 @@ - + diff --git a/library/server/wsf/default/openshift-safe.ecf b/library/server/wsf/default/openshift-safe.ecf index 1f5a6c95..904ad908 100644 --- a/library/server/wsf/default/openshift-safe.ecf +++ b/library/server/wsf/default/openshift-safe.ecf @@ -1,5 +1,5 @@ - + @@ -7,10 +7,11 @@ /\.git$ /\.svn$ - - - - + + + diff --git a/library/server/wsf/wsf-safe.ecf b/library/server/wsf/wsf-safe.ecf index 7867df01..9fd98569 100644 --- a/library/server/wsf/wsf-safe.ecf +++ b/library/server/wsf/wsf-safe.ecf @@ -1,5 +1,5 @@ - + diff --git a/library/text/encoder/encoder-safe.ecf b/library/text/encoder/encoder-safe.ecf index b7307359..e6f73687 100644 --- a/library/text/encoder/encoder-safe.ecf +++ b/library/text/encoder/encoder-safe.ecf @@ -1,5 +1,5 @@ - + diff --git a/tests/all-stable-safe.ecf b/tests/all-stable-safe.ecf index 9903a6eb..1f0b84f5 100644 --- a/tests/all-stable-safe.ecf +++ b/tests/all-stable-safe.ecf @@ -1,5 +1,5 @@ - + Integration project including many lib diff --git a/tools/ise_wizard/ewf_ise_wizard-safe.ecf b/tools/ise_wizard/ewf_ise_wizard-safe.ecf index 36ca6b24..8b68184e 100644 --- a/tools/ise_wizard/ewf_ise_wizard-safe.ecf +++ b/tools/ise_wizard/ewf_ise_wizard-safe.ecf @@ -1,5 +1,5 @@ - + From fcf8b6366670ef8a4c12efbdb4fa9acd5d667757 Mon Sep 17 00:00:00 2001 From: Jocelyn Fiat Date: Wed, 14 May 2014 16:16:32 +0200 Subject: [PATCH 2/3] Make sure to be able to compile in complete void-safe for 14.05 and still compile with 13.11 --- tests/all-safe.ecf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/all-safe.ecf b/tests/all-safe.ecf index 869f2432..9319a159 100644 --- a/tests/all-safe.ecf +++ b/tests/all-safe.ecf @@ -1,5 +1,5 @@ - + Integration project including many lib @@ -47,7 +47,6 @@ - @@ -55,6 +54,7 @@ + From b59966595ed74dd9ba591821563189bf1a3c0a92 Mon Sep 17 00:00:00 2001 From: Jocelyn Fiat Date: Wed, 14 May 2014 16:18:10 +0200 Subject: [PATCH 3/3] Make sure to be able to compile in complete void-safe for 14.05 and still compile with 13.11 --- tests/all-stable-safe.ecf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/all-stable-safe.ecf b/tests/all-stable-safe.ecf index 1f0b84f5..fccfd95c 100644 --- a/tests/all-stable-safe.ecf +++ b/tests/all-stable-safe.ecf @@ -1,5 +1,5 @@ - + Integration project including many lib