head	1.2;
access;
symbols
	pkgsrc-2017Q3:1.1.0.26
	pkgsrc-2017Q3-base:1.1
	pkgsrc-2017Q2:1.1.0.22
	pkgsrc-2017Q2-base:1.1
	pkgsrc-2017Q1:1.1.0.20
	pkgsrc-2017Q1-base:1.1
	pkgsrc-2016Q4:1.1.0.18
	pkgsrc-2016Q4-base:1.1
	pkgsrc-2016Q3:1.1.0.16
	pkgsrc-2016Q3-base:1.1
	pkgsrc-2016Q2:1.1.0.14
	pkgsrc-2016Q2-base:1.1
	pkgsrc-2016Q1:1.1.0.12
	pkgsrc-2016Q1-base:1.1
	pkgsrc-2015Q4:1.1.0.10
	pkgsrc-2015Q4-base:1.1
	pkgsrc-2015Q3:1.1.0.8
	pkgsrc-2015Q3-base:1.1
	pkgsrc-2015Q2:1.1.0.6
	pkgsrc-2015Q2-base:1.1
	pkgsrc-2015Q1:1.1.0.4
	pkgsrc-2015Q1-base:1.1
	pkgsrc-2014Q4:1.1.0.2
	pkgsrc-2014Q4-base:1.1;
locks; strict;
comment	@// @;


1.2
date	2017.10.27.13.52.05;	author ryoon;	state dead;
branches;
next	1.1;
commitid	1t9uUNgNKBgpbHcA;

1.1
date	2014.11.03.12.18.32;	author ryoon;	state Exp;
branches;
next	;
commitid	faEeuguVVaqDFJWx;


desc
@@


1.2
log
@Remove firefox31
@
text
@$NetBSD: patch-ipc_glue_StringUtil.cpp,v 1.1 2014/11/03 12:18:32 ryoon Exp $

Just because OS_ARCH is Darwin does not mean
sys_string_conversions_mac.mm can be used.

--- ipc/glue/StringUtil.cpp.orig	2014-05-06 22:55:41.000000000 +0000
+++ ipc/glue/StringUtil.cpp
@@@@ -64,14 +64,14 @@@@ namespace base {
 // converters, and implementing the one that doesn't exist for OS X
 // and Windows.
 
-#if !defined(OS_MACOSX) && !defined(OS_WIN)
+#if !defined(MOZ_WIDGET_COCOA) && !defined(OS_WIN)
 std::string SysWideToUTF8(const std::wstring& wide) {
   // FIXME/cjones: do this with iconv
   return GhettoStringConvert<std::wstring, std::string>(wide);
 }
 #endif
 
-#if !defined(OS_MACOSX) && !defined(OS_WIN)
+#if !defined(MOZ_WIDGET_COCOA) && !defined(OS_WIN)
 std::wstring SysUTF8ToWide(const StringPiece& utf8) {
   // FIXME/cjones: do this with iconv
   return GhettoStringConvert<StringPiece, std::wstring>(utf8);
@


1.1
log
@Import firefox31-31.2.0 as www/firefox31.

Mozilla Firefox is a free, open-source and cross-platform web browser
for Windows, Linux, MacOS X and many other operating systems.

It is fast and easy to use, and offers many advantages over other web
browsers, such as tabbed browsing and the ability to block pop-up
windows.

Firefox also offers excellent bookmark and history management, and it
can be extended by developers using industry standards such as XML,
CSS, JavaScript, C++, etc. Many extensions are available.
@
text
@d1 1
a1 1
$NetBSD: patch-ipc_glue_StringUtil.cpp,v 1.1 2014/05/30 03:03:36 pho Exp $
@