[vlc-commits] activex: Fix mismatching string concatenation

Hugo Beauzée-Luyssen git at videolan.org
Fri Apr 17 13:31:15 CEST 2015


npapi-vlc | branch: cleanup | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Wed Apr 15 11:06:57 2015 +0200| [31ffcc470d5470a55e278e5e365598f95329bd24] | committer: Hugo Beauzée-Luyssen

activex: Fix mismatching string concatenation

This makes MSVC unhappy, and the macros weren't used anywhere else anyway

> http://git.videolan.org/gitweb.cgi/npapi-vlc.git/?a=commit;h=31ffcc470d5470a55e278e5e365598f95329bd24
---

 activex/main.cpp |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/activex/main.cpp b/activex/main.cpp
index e9a7978..69fa73c 100644
--- a/activex/main.cpp
+++ b/activex/main.cpp
@@ -49,14 +49,12 @@ DEFINE_GUID(CATID_SafeForScripting, \
 
 using namespace std;
 
-#define COMPANY_STR "VideoLAN"
-#define PROGRAM_STR "VLCPlugin"
 #define DESCRIPTION "VLC ActiveX Plugin and IE Web Plugin"
 
 #define THREADING_MODEL "Apartment"
 #define MISC_STATUS     "131473"
 
-#define PROGID_STR COMPANY_STR "." PROGRAM_STR
+#define PROGID_STR "VideoLAN.VLCPlugin"
 
 #define GUID_STRLEN 39
 



More information about the vlc-commits mailing list