Imported Upstream version 2.10.4

[platform/upstream/freetype2.git] / src / otvalid / otverror.h

diff --git a/src/otvalid/otverror.h b/src/otvalid/otverror.h
index 522f4a2..979e9cb 100644 (file)
--- a/src/otvalid/otverror.h
+++ b/src/otvalid/otverror.h
@@ -1,44 +1,42 @@
-/***************************************************************************/
-/*                                                                         */
-/*  otverror.h                                                             */
-/*                                                                         */
-/*    OpenType validation module error codes (specification only).         */
-/*                                                                         */
-/*  Copyright 2004, 2005, 2012 by                                          */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* This file is used to define the OpenType validation module error      */
-  /* enumeration constants.                                                */
-  /*                                                                       */
-  /*************************************************************************/
-
-#ifndef __OTVERROR_H__
-#define __OTVERROR_H__
-
-#include FT_MODULE_ERRORS_H
-
-#undef __FTERRORS_H__
+/****************************************************************************
+ *
+ * otverror.h
+ *
+ *   OpenType validation module error codes (specification only).
+ *
+ * Copyright (C) 2004-2020 by
+ * David Turner, Robert Wilhelm, and Werner Lemberg.
+ *
+ * This file is part of the FreeType project, and may only be used,
+ * modified, and distributed under the terms of the FreeType project
+ * license, LICENSE.TXT.  By continuing to use, modify, or distribute
+ * this file you indicate that you have read the license and
+ * understand and accept it fully.
+ *
+ */
+
+
+  /**************************************************************************
+   *
+   * This file is used to define the OpenType validation module error
+   * enumeration constants.
+   *
+   */
+
+#ifndef OTVERROR_H_
+#define OTVERROR_H_
+
+#include <freetype/ftmoderr.h>
+
+#undef FTERRORS_H_
 
 #undef  FT_ERR_PREFIX
 #define FT_ERR_PREFIX  OTV_Err_
 #define FT_ERR_BASE    FT_Mod_Err_OTvalid
 
-#define FT_KEEP_ERR_PREFIX
+#include <freetype/fterrors.h>
 
-#include FT_ERRORS_H
-
-#endif /* __OTVERROR_H__ */
+#endif /* OTVERROR_H_ */
 
 
 /* END */