This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2848

xdiff: move stdint.h to xdiff.h
ClosedPublic

Authored by quark on Mar 13 2018, 7:56 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHGa2baa61bbb14: xdiff: move stdint.h to xdiff.h
rHGafebb7588e95: xdiff: move stdint.h to xdiff.h
Summary

It's more correct to put it in xdiff.h since that file actually uses int64_t
etc and xdiff.h is included by xinclude.h.

This should fix the oss-fuzz build. Thanks durin42 for discovering the
issue.

Test Plan

make local and xdiff related tests still work.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

quark created this revision.Mar 13 2018, 7:56 PM
durin42 accepted this revision.Mar 13 2018, 8:04 PM
This revision is now accepted and ready to land.Mar 13 2018, 8:04 PM
Closed by commit rHGafebb7588e95: xdiff: move stdint.h to xdiff.h (authored by quark). · Explain WhyMar 13 2018, 8:05 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 7006

mercurial/thirdparty/xdiff/xdiff.h

#define XDIFF_H #define XDIFF_H
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif /* #ifdef __cplusplus */ #endif /* #ifdef __cplusplus */
#include <stddef.h> /* size_t */ #include <stddef.h> /* size_t */
#if !defined(_MSC_VER) || _MSC_VER >= 1600
#include <stdint.h>
#else
/* prior to Visual Studio 2010 */
typedef long long int64_t;
typedef unsigned long long uint64_t;
#endif
/* xpparm_t.flags */ /* xpparm_t.flags */
#define XDF_NEED_MINIMAL (1 << 0) #define XDF_NEED_MINIMAL (1 << 0)
#define XDF_INDENT_HEURISTIC (1 << 23) #define XDF_INDENT_HEURISTIC (1 << 23)
/* emit bdiff-style "matched" (a1, a2, b1, b2) hunks instead of "different" /* emit bdiff-style "matched" (a1, a2, b1, b2) hunks instead of "different"
* (a1, a2 - a1, b1, b2 - b1) hunks */ * (a1, a2 - a1, b1, b2 - b1) hunks */
#define XDL_EMIT_BDIFFHUNK (1 << 4) #define XDL_EMIT_BDIFFHUNK (1 << 4)

mercurial/thirdparty/xdiff/xinclude.h

* Davide Libenzi <davidel@xmailserver.org> * Davide Libenzi <davidel@xmailserver.org>
* *
*/ */
#if !defined(XINCLUDE_H) #if !defined(XINCLUDE_H)
#define XINCLUDE_H #define XINCLUDE_H
#include <ctype.h> #include <ctype.h>
#if !defined(_MSC_VER) || _MSC_VER >= 1600
#include <stdint.h>
#else
/* prior to Visual Studio 2010 */
typedef long long int64_t;
typedef unsigned long long uint64_t;
#endif
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <limits.h> #include <limits.h>
#include "xmacros.h" #include "xmacros.h"
#include "xdiff.h" #include "xdiff.h"
#include "xtypes.h" #include "xtypes.h"
#include "xutils.h" #include "xutils.h"
#include "xprepare.h" #include "xprepare.h"
#include "xdiffi.h" #include "xdiffi.h"
#endif /* #if !defined(XINCLUDE_H) */ #endif /* #if !defined(XINCLUDE_H) */