There is no "paperconf" command on macOS

Change-Id: I01c4cf877eca81880381060e1b3ebedf2979bcb8

There is no "paperconf" command on macOS
Change-Id: I01c4cf877eca81880381060e1b3ebedf2979bcb8
992bc9df · Tor Lillqvist · 5ba0b8f9 · 992bc9df
Kaydet (Commit) 992bc9df authored Kas 10, 2017 tarafından Tor Lillqvist
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

paper.cxx i18nutil/source/utility/paper.cxx +2 -0

No files found.
--- a/i18nutil/source/utility/paper.cxx
+++ b/i18nutil/source/utility/paper.cxx
@@ -222,6 +222,7 @@ PaperInfo PaperInfo::getSystemDefaultPaper()
        if (bInitialized)
            return aInstance;

+#ifndef MACOSX
        // try libpaper
        // #i78617# workaround missing paperconf command
        FILE* pPipe = popen( "paperconf 2>/dev/null", "r" );
@@ -284,6 +285,7 @@ PaperInfo PaperInfo::getSystemDefaultPaper()
                }
            }
        }
+#endif

 #if defined(LC_PAPER) && defined(_GNU_SOURCE)
        // try LC_PAPER