patch 8.1.0811: too many #ifdefs
Problem: Too many #ifdefs.
Solution: Graduate FEAT_MBYTE, the final chapter.
diff --git a/src/structs.h b/src/structs.h
index 3216c58..e25ae17 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -416,12 +416,8 @@
/*
* structures used in undo.c
*/
-#if VIM_SIZEOF_INT > 2
-# define ALIGN_LONG /* longword alignment and use filler byte */
-# define ALIGN_SIZE (sizeof(long))
-#else
-# define ALIGN_SIZE (sizeof(short))
-#endif
+#define ALIGN_LONG /* longword alignment and use filler byte */
+#define ALIGN_SIZE (sizeof(long))
#define ALIGN_MASK (ALIGN_SIZE - 1)
@@ -1229,19 +1225,11 @@
# endif
#else
/* Use 32-bit Number. */
-# if VIM_SIZEOF_INT <= 3 /* use long if int is smaller than 32 bits */
-typedef long varnumber_T;
-typedef unsigned long uvarnumber_T;
-#define VARNUM_MIN LONG_MIN
-#define VARNUM_MAX LONG_MAX
-#define UVARNUM_MAX ULONG_MAX
-# else
typedef int varnumber_T;
typedef unsigned int uvarnumber_T;
#define VARNUM_MIN INT_MIN
#define VARNUM_MAX INT_MAX
#define UVARNUM_MAX UINT_MAX
-# endif
#endif
typedef double float_T;