summaryrefslogtreecommitdiff
path: root/libusb/libusb-1.0.rc
diff options
context:
space:
mode:
authorPete Batard <pete@akeo.ie>2012-01-08 00:16:34 +0000
committerPete Batard <pete@akeo.ie>2012-01-08 01:52:40 +0000
commitc7224c9c90c6533a2c568cd6adb3ba3c65b67b39 (patch)
tree1e007cf9dd05e524d5b0eed5804991b0989de2c6 /libusb/libusb-1.0.rc
parente182dbad23570634d6cca971aa6b820898377d4e (diff)
downloadlibusb-c7224c9c90c6533a2c568cd6adb3ba3c65b67b39.tar.gz
[misc] align with master
* up to "Core: Fix #122 warning: no previous prototype for ‘usbi_log_v’" a8e2e7cab278fbfcba91909eaf762cf66da9eda5
Diffstat (limited to 'libusb/libusb-1.0.rc')
-rw-r--r--libusb/libusb-1.0.rc9
1 files changed, 7 insertions, 2 deletions
diff --git a/libusb/libusb-1.0.rc b/libusb/libusb-1.0.rc
index 6072159..e2e8617 100644
--- a/libusb/libusb-1.0.rc
+++ b/libusb/libusb-1.0.rc
@@ -11,9 +11,15 @@
#ifndef LIBUSB_VERSIONSTRING
#define LU_STR(s) #s
#define LU_XSTR(s) LU_STR(s)
+#if LIBUSB_NANO > 0
#define LIBUSB_VERSIONSTRING \
LU_XSTR(LIBUSB_MAJOR) "." LU_XSTR(LIBUSB_MINOR) "." \
- LU_XSTR(LIBUSB_MICRO) "." LU_XSTR(LIBUSB_NANO)
+ LU_XSTR(LIBUSB_MICRO) "." LU_XSTR(LIBUSB_NANO) LIBUSB_RC "\0"
+#else
+#define LIBUSB_VERSIONSTRING \
+ LU_XSTR(LIBUSB_MAJOR) "." LU_XSTR(LIBUSB_MINOR) "." \
+ LU_XSTR(LIBUSB_MICRO) LIBUSB_RC "\0"
+#endif
#endif
VS_VERSION_INFO VERSIONINFO
@@ -33,7 +39,6 @@ BEGIN
BEGIN
BLOCK "040904b0"
BEGIN
- VALUE "Comments", "http://libusb.org/\0"
VALUE "CompanyName", "libusb.org\0"
VALUE "FileDescription", "C library for writing portable USB drivers in userspace\0"
VALUE "FileVersion", LIBUSB_VERSIONSTRING