Merge svn changes up to r28641

Convert vo_x11_border (used in vo_gl/gl2 though the vo_gl_border
macro) to use a wrapper macro in old-style VOs which do not provide a
VO object argument. Before this function had an explicit global_vo
argument in vo_gl/gl2. New vo_vdpau uses it too so use the same
mechanism as most other functions.

2 files changed, 2 insertions, 2 deletions

diff --git a/loader/qtx/list.c b/loader/qtx/list.c
index 34e93dccc5..4669067d30 100644
--- a/loader/qtx/list.c
+++ b/loader/qtx/list.c
@@ -18,7 +18,7 @@ void* GetProcAddress(void* handle,char* func);
 #define __cdecl   __attribute__((__cdecl__))
 #define APIENTRY 
 
-int main(int argc, char *argv[]){
+int main(void) {
     void *handler;
     ComponentDescription desc;
     Component (*FindNextComponent)(Component prev,ComponentDescription* desc);
diff --git a/loader/qtx/qtxload.c b/loader/qtx/qtxload.c
index 0fb13aa9a4..8767559aa1 100644
--- a/loader/qtx/qtxload.c
+++ b/loader/qtx/qtxload.c
@@ -33,7 +33,7 @@ unsigned int* x_table[0x00001837];
 
 static    OSErr (*InitializeQTML)(long flags);
 
-int main(int argc, char *argv[]){
+int main(void) {
     void *handler;
     void *handler2;
     void* theqtdp=NULL;