Don't declare constants as export and later define it as static. This is not allowed by GCC4.

Modified: trunk/reactos/tools/widl/ChangeLog
Modified: trunk/reactos/tools/widl/client.c
Modified: trunk/reactos/tools/widl/server.c

--- trunk/reactos/tools/widl/ChangeLog	2005-05-08 02:16:32 UTC (rev 15108)
+++ trunk/reactos/tools/widl/ChangeLog	2005-05-08 02:30:45 UTC (rev 15109)
@@ -1,5 +1,13 @@

 ChangeLog
 

+2004-05-08 weiden
+
+   tools/widl/client.c
+   tools/widl/proxy.c
+   tools/widl/server.c
+
+Generate code GCC4.x accepts.
+

 2005-04-18 navaraf
 
    tools/widl/parser.y

--- trunk/reactos/tools/widl/client.c	2005-05-08 02:16:32 UTC (rev 15108)
+++ trunk/reactos/tools/widl/client.c	2005-05-08 02:30:45 UTC (rev 15109)
@@ -141,7 +141,7 @@

     unsigned int type_offset = 2;
     int in_attr, out_attr;
 

-    print_client("static const MIDL_PROC_FORMAT_STRING __MIDL_ProcFormatString =\n");

+    print_client("const MIDL_PROC_FORMAT_STRING __MIDL_ProcFormatString =\n");

     print_client("{\n");
     indent++;
     print_client("0,\n");
@@ -285,7 +285,7 @@

     int string_attr;
     int ptr_attr, ref_attr, unique_attr;
 

-    print_client("static const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString =\n");

+    print_client("const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString =\n");

     print_client("{\n");
     indent++;
     print_client("0,\n");
@@ -1501,7 +1501,7 @@

 {
     char *implicit_handle = get_attrp(iface->attrs, ATTR_IMPLICIT_HANDLE);
 

-    print_client("static const MIDL_STUB_DESC %s_StubDesc =\n", iface->name);

+    print_client("const MIDL_STUB_DESC %s_StubDesc =\n", iface->name);

     print_client("{\n");
     indent++;
     print_client("(void __RPC_FAR *)& %s___RpcClientInterface,\n", iface->name);

--- trunk/reactos/tools/widl/server.c	2005-05-08 02:16:32 UTC (rev 15108)
+++ trunk/reactos/tools/widl/server.c	2005-05-08 02:30:45 UTC (rev 15109)
@@ -146,7 +146,7 @@

     unsigned int type_offset = 2;
     int in_attr, out_attr;
 

-    print_server("static const MIDL_PROC_FORMAT_STRING __MIDL_ProcFormatString =\n");

+    print_server("const MIDL_PROC_FORMAT_STRING __MIDL_ProcFormatString =\n");

     print_server("{\n");
     indent++;
     print_server("0,\n");
@@ -282,7 +282,7 @@

     int string_attr;
     int ptr_attr, ref_attr, unique_attr;
 

-    print_server("static const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString =\n");

+    print_server("const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString =\n");

     print_server("{\n");
     indent++;
     print_server("0,\n");
@@ -1466,7 +1466,7 @@

 
 static void write_stubdescriptor(type_t *iface)
 {

-    print_server("static const MIDL_STUB_DESC %s_StubDesc =\n", iface->name);

+    print_server("const MIDL_STUB_DESC %s_StubDesc =\n", iface->name);

     print_server("{\n");
     indent++;
     print_server("(void __RPC_FAR *)& %s___RpcServerInterface,\n", iface->name);