Rob Shearman : shell32: Remove defines for WINE_FILEVERSION and WINE_FILEVERSION_STR.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 55f12a3b63323bdc16ea2ccdf9806dfc05b15f23
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=55f12a3b63323bdc16ea2ccdf9...

Author: Rob Shearman 
Date:   Fri Sep  5 22:07:37 2008 +0100

shell32: Remove defines for WINE_FILEVERSION and WINE_FILEVERSION_STR.

These are now constructed automatically from the major, minor, build
and platform ID numbers defined in version.h.

---

dlls/shell32/version.h  |    4 ----
 dlls/shell32/version.rc |    1 -
 2 files changed, 0 insertions(+), 5 deletions(-)

diff --git a/dlls/shell32/version.h b/dlls/shell32/version.h
index cd0d8db..aedf231 100644
--- a/dlls/shell32/version.h
+++ b/dlls/shell32/version.h
@@ -22,7 +22,3 @@
 #define WINE_FILEVERSION_MINOR         0
 #define WINE_FILEVERSION_BUILD      3900
 #define WINE_FILEVERSION_PLATFORMID 6975
-
-/* FIXME: when libs/wpp gets fixed to support concatenation we can remove
- * this and define it in version.rc */
-#define WINE_FILEVERSION_STR "5.0.3900.6975"
diff --git a/dlls/shell32/version.rc b/dlls/shell32/version.rc
index a5e23dd..046387a 100644
--- a/dlls/shell32/version.rc
+++ b/dlls/shell32/version.rc
@@ -21,7 +21,6 @@
 #include "version.h"

#define WINE_OLESELFREGISTER
-#define WINE_FILEVERSION WINE_FILEVERSION_MAJOR,WINE_FILEVERSION_MINOR,WINE_FILEVERSION_BUILD,WINE_FILEVERSION_PLATFORMID
 #define WINE_FILENAME_STR "shell32.dll"

#include <wine/wine_common_ver.rc>