You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@corinthia.apache.org by ja...@apache.org on 2015/02/13 09:52:35 UTC
[23/38] incubator-corinthia git commit: Take ATTRIBUTE_FORMAT macros
back out of DFError.h
Take ATTRIBUTE_FORMAT macros back out of DFError.h
This macro is in DFPlatform.h, which all source files include. However
there was a build failure on OS X, which turned out to be the two
Objective C files (FunctionTests.m and StringTests.m) which did not have
the DFPlatform.h include.
Both files now have this include, so the macro does not need to repeated
in DFError.h.
Project: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/commit/8f24246e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/tree/8f24246e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/diff/8f24246e
Branch: refs/heads/experimentZip
Commit: 8f24246ea1bb005127550a8a32c2277d0de247ba
Parents: 2383716
Author: Peter Kelly <pe...@uxproductivity.com>
Authored: Mon Jan 12 06:13:43 2015 +0700
Committer: Peter Kelly <pe...@uxproductivity.com>
Committed: Mon Jan 12 06:14:49 2015 +0700
----------------------------------------------------------------------
DocFormats/api/headers/DocFormats/DFError.h | 10 ----------
DocFormats/filters/odf/src/text/ODFText.c | 1 +
consumers/dfutil/src/FunctionTests.m | 1 +
consumers/dfutil/src/StringTests.m | 1 +
4 files changed, 3 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/8f24246e/DocFormats/api/headers/DocFormats/DFError.h
----------------------------------------------------------------------
diff --git a/DocFormats/api/headers/DocFormats/DFError.h b/DocFormats/api/headers/DocFormats/DFError.h
index 2876007..1742d98 100644
--- a/DocFormats/api/headers/DocFormats/DFError.h
+++ b/DocFormats/api/headers/DocFormats/DFError.h
@@ -17,16 +17,6 @@
#include <stdarg.h>
-// It's really not nice having this here, but is the only way to get the compiler to typecheck the
-// DFErrorFormat arguments when such functionality is available.
-#ifndef ATTRIBUTE_FORMAT
-#ifdef _MSC_VER
-#define ATTRIBUTE_FORMAT(archetype,index,first)
-#else
-#define ATTRIBUTE_FORMAT(archetype,index,first) __attribute__((format(archetype,index,first)))
-#endif
-#endif
-
typedef struct DFError DFError;
void DFErrorSetPosix(DFError **error, int code);
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/8f24246e/DocFormats/filters/odf/src/text/ODFText.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/odf/src/text/ODFText.c b/DocFormats/filters/odf/src/text/ODFText.c
index 6986499..8e94ee9 100644
--- a/DocFormats/filters/odf/src/text/ODFText.c
+++ b/DocFormats/filters/odf/src/text/ODFText.c
@@ -12,6 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+#include "DFPlatform.h"
#include "ODFText.h"
DFDocument *ODFTextGet(DFStorage *concreteStorage, DFStorage *abstractStorage, DFError **error)
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/8f24246e/consumers/dfutil/src/FunctionTests.m
----------------------------------------------------------------------
diff --git a/consumers/dfutil/src/FunctionTests.m b/consumers/dfutil/src/FunctionTests.m
index f458cc3..97d8312 100644
--- a/consumers/dfutil/src/FunctionTests.m
+++ b/consumers/dfutil/src/FunctionTests.m
@@ -13,6 +13,7 @@
// limitations under the License.
#import <Foundation/Foundation.h>
+#include "DFPlatform.h"
#include "FunctionTests.h"
#include "DFString.h"
#include "DFFilesystem.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/8f24246e/consumers/dfutil/src/StringTests.m
----------------------------------------------------------------------
diff --git a/consumers/dfutil/src/StringTests.m b/consumers/dfutil/src/StringTests.m
index 7e16c51..992d042 100644
--- a/consumers/dfutil/src/StringTests.m
+++ b/consumers/dfutil/src/StringTests.m
@@ -13,6 +13,7 @@
// limitations under the License.
#import <Foundation/Foundation.h>
+#include "DFPlatform.h"
#include "StringTests.h"
#include "DFString.h"