hg: remove reserved identifiers

Per 7.1.3 paragraph, from C draft:

All identifiers that begin with an underscore and either an uppercase letter or
another underscore are always reserved for any use.

mercurial/bdiff.h

@@ -1,23 +1,23 b''
-#ifndef _HG_BDIFF_H_
-#define _HG_BDIFF_H_
+#ifndef HG_BDIFF_H
+#define HG_BDIFF_H
 
 #include "compat.h"
 
 struct bdiff_line {
 	int hash, n, e;
 	ssize_t len;
 	const char *l;
 };
 
 struct bdiff_hunk;
 struct bdiff_hunk {
 	int a1, a2, b1, b2;
 	struct bdiff_hunk *next;
 };
 
 int bdiff_splitlines(const char *a, ssize_t len, struct bdiff_line **lr);
 int bdiff_diff(struct bdiff_line *a, int an, struct bdiff_line *b, int bn,
                struct bdiff_hunk *base);
 void bdiff_freehunks(struct bdiff_hunk *l);
 
 #endif

mercurial/bitmanipulation.h

@@ -1,77 +1,77 b''
-#ifndef _HG_BITMANIPULATION_H_
-#define _HG_BITMANIPULATION_H_
+#ifndef HG_BITMANIPULATION_H
+#define HG_BITMANIPULATION_H
 
 #include <string.h>
 
 #include "compat.h"
 
 /* Reads a 64 bit integer from big-endian bytes. Assumes that the data is long
  enough */
 static inline uint64_t getbe64(const char *c)
 {
 	const unsigned char *d = (const unsigned char *)c;
 
 	return ((((uint64_t)d[0]) << 56) | (((uint64_t)d[1]) << 48) |
 	        (((uint64_t)d[2]) << 40) | (((uint64_t)d[3]) << 32) |
 	        (((uint64_t)d[4]) << 24) | (((uint64_t)d[5]) << 16) |
 	        (((uint64_t)d[6]) << 8) | (d[7]));
 }
 
 static inline uint32_t getbe32(const char *c)
 {
 	const unsigned char *d = (const unsigned char *)c;
 
 	return ((((uint32_t)d[0]) << 24) | (((uint32_t)d[1]) << 16) |
 	        (((uint32_t)d[2]) << 8) | (d[3]));
 }
 
 static inline int16_t getbeint16(const char *c)
 {
 	const unsigned char *d = (const unsigned char *)c;
 
 	return ((d[0] << 8) | (d[1]));
 }
 
 static inline uint16_t getbeuint16(const char *c)
 {
 	const unsigned char *d = (const unsigned char *)c;
 
 	return ((d[0] << 8) | (d[1]));
 }
 
 /* Writes a 64 bit integer to bytes in a big-endian format.
  Assumes that the buffer is long enough */
 static inline void putbe64(uint64_t x, char *c)
 {
 	c[0] = (x >> 56) & 0xff;
 	c[1] = (x >> 48) & 0xff;
 	c[2] = (x >> 40) & 0xff;
 	c[3] = (x >> 32) & 0xff;
 	c[4] = (x >> 24) & 0xff;
 	c[5] = (x >> 16) & 0xff;
 	c[6] = (x >> 8) & 0xff;
 	c[7] = (x)&0xff;
 }
 
 static inline void putbe32(uint32_t x, char *c)
 {
 	c[0] = (x >> 24) & 0xff;
 	c[1] = (x >> 16) & 0xff;
 	c[2] = (x >> 8) & 0xff;
 	c[3] = (x)&0xff;
 }
 
 static inline double getbefloat64(const char *c)
 {
 	const unsigned char *d = (const unsigned char *)c;
 	double ret;
 	int i;
 	uint64_t t = 0;
 	for (i = 0; i < 8; i++) {
 		t = (t << 8) + d[i];
 	}
 	memcpy(&ret, &t, sizeof(t));
 	return ret;
 }
 
 #endif

mercurial/compat.h

@@ -1,58 +1,58 b''
-#ifndef _HG_COMPAT_H_
-#define _HG_COMPAT_H_
+#ifndef HG_COMPAT_H
+#define HG_COMPAT_H
 
 #ifdef _WIN32
 #ifdef _MSC_VER
 #if _MSC_VER < 1900
 /* msvc 6.0 has problems */
 #define inline __inline
 #if defined(_WIN64)
 typedef __int64 ssize_t;
 typedef unsigned __int64 uintptr_t;
 #else
 typedef int ssize_t;
 typedef unsigned int uintptr_t;
 #endif
 typedef signed char int8_t;
 typedef short int16_t;
 typedef long int32_t;
 typedef __int64 int64_t;
 typedef unsigned char uint8_t;
 typedef unsigned short uint16_t;
 typedef unsigned long uint32_t;
 typedef unsigned __int64 uint64_t;
 #else
 /* VC++ 14 */
 #include <stdint.h>
 
 #if defined(_WIN64)
 typedef __int64 ssize_t;
 #else
 typedef int ssize_t;
 #endif
 #endif /* _MSC_VER < 1900 */
 
 #else
 /* not msvc */
 #include <stdint.h>
 #endif
 #else
 /* not windows */
 #include <sys/types.h>
 #if defined __BEOS__ && !defined __HAIKU__
 #include <ByteOrder.h>
 #else
 #include <arpa/inet.h>
 #endif
 #include <inttypes.h>
 #endif
 
 #if defined __hpux || defined __SUNPRO_C || defined _AIX
 #define inline
 #endif
 
 #ifdef __linux
 #define inline __inline
 #endif
 
 #endif

mercurial/mpatch.h

@@ -1,26 +1,26 b''
-#ifndef _HG_MPATCH_H_
-#define _HG_MPATCH_H_
+#ifndef HG_MPATCH_H
+#define HG_MPATCH_H
 
 #define MPATCH_ERR_NO_MEM -3
 #define MPATCH_ERR_CANNOT_BE_DECODED -2
 #define MPATCH_ERR_INVALID_PATCH -1
 
 struct mpatch_frag {
 	int start, end, len;
 	const char *data;
 };
 
 struct mpatch_flist {
 	struct mpatch_frag *base, *head, *tail;
 };
 
 int mpatch_decode(const char *bin, ssize_t len, struct mpatch_flist **res);
 ssize_t mpatch_calcsize(ssize_t len, struct mpatch_flist *l);
 void mpatch_lfree(struct mpatch_flist *a);
 int mpatch_apply(char *buf, const char *orig, ssize_t len,
                  struct mpatch_flist *l);
 struct mpatch_flist *
 mpatch_fold(void *bins, struct mpatch_flist *(*get_next_item)(void *, ssize_t),
             ssize_t start, ssize_t end);
 
 #endif