ooo-build r13248 - in trunk: . patches/dev300

[brosenk svn gnome org]

Author: brosenk
Date: Wed Jul 16 13:17:16 2008
New Revision: 13248
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13248&view=rev

Log:
Make sure testing-more-optimizations-ark.diff is applied after
store-registry.diff


Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/testing-more-optimizations-ark.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed Jul 16 13:17:16 2008
@@ -1374,13 +1374,6 @@
 basic-prj-build_lst.diff
 
 
-[ ArkOnly ]
-SectionOwner => brosenk
-
-# See what breaks if we build with more optimizations
-testing-more-optimizations-ark.diff
-
-
 [ GentooExperimental ]
 SectionOwner => hmth
 
@@ -2563,3 +2556,9 @@
 
 [ BFFixes ]
 fit-list-to-size-binfilter.diff, thorsten
+
+[ ArkOnly ]
+SectionOwner => brosenk
+
+# See what breaks if we build with more optimizations
+testing-more-optimizations-ark.diff

Modified: trunk/patches/dev300/testing-more-optimizations-ark.diff
==============================================================================
--- trunk/patches/dev300/testing-more-optimizations-ark.diff	(original)
+++ trunk/patches/dev300/testing-more-optimizations-ark.diff	Wed Jul 16 13:17:16 2008
@@ -13,15 +13,12 @@
  .IF "$(OS)"=="SOLARIS"
 --- ./registry/inc/registry/registry.h.optimize~	2008-04-11 12:45:33.000000000 +0200
 +++ ./registry/inc/registry/registry.h	2008-07-07 20:12:51.808846525 +0200
-@@ -50,7 +50,7 @@ extern "C" {
+@@ -50,4 +50,4 @@ extern "C" {
                       reg_closeKey. If the function fails, phNewKey is NULL.
  	@return	REG_NO_ERROR if succeeds else an error code. 
  */
 -RegError REGISTRY_CALLTYPE reg_createKey(RegKeyHandle hKey, 
 +RegError REGISTRY_CALLTYPE SAL_DLLPUBLIC_EXPORT reg_createKey(RegKeyHandle hKey, 
- 										 rtl_uString* keyName, 
- 										 RegKeyHandle* phNewKey);
- 
 @@ -65,7 +65,7 @@ RegError REGISTRY_CALLTYPE reg_createKey
                       reg_closeKey. If the function fails, phNewKey is NULL.
  	@return	REG_NO_ERROR if succeeds else an error code.