diff options
| author | Moonchild <moonchild@palemoon.org> | 2021-05-06 09:24:03 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2021-05-06 09:24:03 +0000 |
| commit | 6f707bde95dab6998ac204f9ee6c925ee230c740 (patch) | |
| tree | 859f6cf99f2e026b76dcc40b27b211154310d16e /toolkit/components/places | |
| parent | aa0fd3d68c856504646e1d7eb499bc890ef44101 (diff) | |
| download | uxp-6f707bde95dab6998ac204f9ee6c925ee230c740.tar.gz | |
Issue #1751 -- Remove XP_MACOSX conditionals from the rest of the tree.
This also removes some PP abuse and takes file entries out of PP when no longer
needed without XP_MACOSX conditionals.
Diffstat (limited to 'toolkit/components/places')
| -rw-r--r-- | toolkit/components/places/PlacesUtils.jsm | 8 | ||||
| -rw-r--r-- | toolkit/components/places/moz.build | 3 |
2 files changed, 2 insertions, 9 deletions
diff --git a/toolkit/components/places/PlacesUtils.jsm b/toolkit/components/places/PlacesUtils.jsm index 259fb7aa7d..ab753ba86b 100644 --- a/toolkit/components/places/PlacesUtils.jsm +++ b/toolkit/components/places/PlacesUtils.jsm @@ -60,14 +60,8 @@ XPCOMUtils.defineLazyModuleGetter(this, "PlacesUIUtils", // refresh instead. const MIN_TRANSACTIONS_FOR_BATCH = 5; -// On Mac OSX, the transferable system converts "\r\n" to "\n\n", where -// we really just want "\n". On other platforms, the transferable system -// converts "\r\n" to "\n". -#ifdef XP_MACOSX -const NEWLINE = "\n"; -#else +// The transferable system converts "\r\n" to "\n" where needed. const NEWLINE = "\r\n"; -#endif function QI_node(aNode, aIID) { var result = null; diff --git a/toolkit/components/places/moz.build b/toolkit/components/places/moz.build index fda73f761f..4c6ce89565 100644 --- a/toolkit/components/places/moz.build +++ b/toolkit/components/places/moz.build @@ -68,10 +68,9 @@ if CONFIG['MOZ_PLACES']: 'PlacesSearchAutocompleteProvider.jsm', 'PlacesSyncUtils.jsm', 'PlacesTransactions.jsm', + 'PlacesUtils.jsm', ] - EXTRA_PP_JS_MODULES += ['PlacesUtils.jsm'] - EXTRA_COMPONENTS += [ 'ColorAnalyzer.js', 'nsLivemarkService.js', |