Radish alpha
H
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Fix build on 32bit by ensuring info bits are wide enough
Bryan Drewery committed 12 years ago
commit c7daa20f7f6e84a71e82d8b6a9f2d38f1de1e774
parent e45c1fd
1 file changed +33 -33
modified pkg/pkgcli.h
@@ -181,48 +181,48 @@ void usage_config(void);
/* utils */

/* These are the fields of the Full output, in order */
-
#define INFO_NAME		(1L<<0)
-
#define INFO_VERSION		(1L<<1)
-
#define INFO_ORIGIN		(1L<<2)
-
#define INFO_PREFIX		(1L<<3)
-
#define INFO_REPOSITORY		(1L<<4)
-
#define INFO_CATEGORIES		(1L<<5)
-
#define INFO_LICENSES		(1L<<6)
-
#define INFO_MAINTAINER		(1L<<7)
-
#define INFO_WWW		(1L<<8)
-
#define INFO_COMMENT		(1L<<9)
-
#define INFO_OPTIONS		(1L<<10)
-
#define INFO_SHLIBS_REQUIRED	(1L<<11)
-
#define INFO_SHLIBS_PROVIDED	(1L<<12)
-
#define INFO_ANNOTATIONS	(1L<<13)
-
#define INFO_FLATSIZE		(1L<<14)
-
#define INFO_PKGSIZE		(1L<<15)
-
#define INFO_DESCR		(1L<<16)
+
#define INFO_NAME		(1LL<<0)
+
#define INFO_VERSION		(1LL<<1)
+
#define INFO_ORIGIN		(1LL<<2)
+
#define INFO_PREFIX		(1LL<<3)
+
#define INFO_REPOSITORY		(1LL<<4)
+
#define INFO_CATEGORIES		(1LL<<5)
+
#define INFO_LICENSES		(1LL<<6)
+
#define INFO_MAINTAINER		(1LL<<7)
+
#define INFO_WWW		(1LL<<8)
+
#define INFO_COMMENT		(1LL<<9)
+
#define INFO_OPTIONS		(1LL<<10)
+
#define INFO_SHLIBS_REQUIRED	(1LL<<11)
+
#define INFO_SHLIBS_PROVIDED	(1LL<<12)
+
#define INFO_ANNOTATIONS	(1LL<<13)
+
#define INFO_FLATSIZE		(1LL<<14)
+
#define INFO_PKGSIZE		(1LL<<15)
+
#define INFO_DESCR		(1LL<<16)

/* Other fields not part of the Full output */
-
#define INFO_MESSAGE		(1L<<17)
-
#define INFO_DEPS		(1L<<18)
-
#define INFO_RDEPS		(1L<<19)
-
#define INFO_FILES		(1L<<20)
-
#define INFO_DIRS		(1L<<21)
-
#define INFO_USERS		(1L<<22)
-
#define INFO_GROUPS		(1L<<23)
-
#define INFO_ARCH		(1L<<24)
-
#define INFO_REPOURL		(1L<<25)
-
#define INFO_LOCKED		(1L<<26)
-
#define INFO_OPTION_DEFAULTS    (1L<<27)
-
#define INFO_OPTION_DESCRIPTIONS (1L<<28)
+
#define INFO_MESSAGE		(1LL<<17)
+
#define INFO_DEPS		(1LL<<18)
+
#define INFO_RDEPS		(1LL<<19)
+
#define INFO_FILES		(1LL<<20)
+
#define INFO_DIRS		(1LL<<21)
+
#define INFO_USERS		(1LL<<22)
+
#define INFO_GROUPS		(1LL<<23)
+
#define INFO_ARCH		(1LL<<24)
+
#define INFO_REPOURL		(1LL<<25)
+
#define INFO_LOCKED		(1LL<<26)
+
#define INFO_OPTION_DEFAULTS    (1LL<<27)
+
#define INFO_OPTION_DESCRIPTIONS (1LL<<28)

#define INFO_LASTFIELD	INFO_LOCKED
#define INFO_ALL	(((INFO_LASTFIELD) << 1) - 1)

/* Identifying tags */
-
#define INFO_TAG_NAME		(1L<<60)
-
#define INFO_TAG_ORIGIN		(1L<<61)
-
#define INFO_TAG_NAMEVER	(1L<<62)
+
#define INFO_TAG_NAME		(1LL<<60)
+
#define INFO_TAG_ORIGIN		(1LL<<61)
+
#define INFO_TAG_NAMEVER	(1LL<<62)

/* Output YAML format */
-
#define INFO_RAW	(-1L<<63)
+
#define INFO_RAW	(-1LL<<63)

/* Everything in the 'full' package output */
#define INFO_FULL	(INFO_NAME|INFO_VERSION|INFO_ORIGIN|INFO_PREFIX| \