Attachment #391092 for bug #531846

View | Details | Raw Unified | Return to bug 531846 | Differences between
Collapse All | Expand All




++ b/mozilla-release/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.h

#include <config.h>
#endif

#if 0
#include <a.out.h>
#endif

#ifdef HAVE_MACH_O_NLIST_H
#include <mach-o/nlist.h>
#endif
++ b/mozilla-release/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc

// last slash, or the whole filename if there are no slashes.
string BaseFileName(const string &filename) {
  // Lots of copies!  basename's behavior is less than ideal.
  const char *c_filename = filename.c_str();
  const char *p = strrchr(c_filename, '/');
  string base = p ? p+1 : c_filename;
  return base;
}

++ b/mozilla-release/tools/profiler/local_debug_info_symbolizer.cc

 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

#include <sys/types.h>
#include "PlatformMacros.h"
#include "nsAutoPtr.h"

++ b/mozilla-release/tools/profiler/platform-linux.cc


#define SIGNAL_SAVE_PROFILE SIGUSR2

#if 1
// glibc doesn't implement gettid(2).
#include <sys/syscall.h>
pid_t gettid()
++ b/mozilla-release/tools/profiler/platform.h

#ifndef TOOLS_PLATFORM_H_
#define TOOLS_PLATFORM_H_

#include <sys/types.h>

#ifdef ANDROID
#include <android/log.h>
#else
++ b/mozilla-release/tools/profiler/LulElf.cpp

// Return the non-directory portion of FILENAME: the portion after the
// last slash, or the whole filename if there are no slashes.
string BaseFileName(const string &filename) {
  // basename's behavior is less than ideal so avoid it
  const char *c_filename = filename.c_str();
  const char *p = strrchr(c_filename, '/');
  string base = p ? p+1 : c_filename;
  return base;
}
++ b/mozilla-release/media/mtransport/third_party/nICEr/src/stun/addrs.c

#include <sys/param.h>
#include <sys/socket.h>
#ifndef ANDROID
#include <sys/sysctl.h>
#include <sys/syslog.h>
#else
#include <syslog.h>

#include <sys/sockio.h>
#else
#include <linux/sockios.h>
#include <linux/if.h>
#include <linux/kernel.h>
#include <linux/if.h>
#include <linux/wireless.h>
#ifndef ANDROID
#include <linux/ethtool.h>
++ b/mozilla-release/memory/mozjemalloc/jemalloc.c

#include <sys/time.h>
#include <sys/types.h>
#if !defined(MOZ_MEMORY_SOLARIS) && !defined(MOZ_MEMORY_ANDROID)
#include <sys/sysctl.h>
#endif
#include <sys/uio.h>
#ifndef MOZ_MEMORY
++ b/mozilla-release/netwerk/sctp/src/netinet/sctp_os_userspace.h

/* #include <sys/param.h>  in FreeBSD defines MSIZE */
/* #include <sys/ktr.h> */
/* #include <sys/systm.h> */
#if 1
#include <user_queue.h>
#else
#include <sys/queue.h>
++ b/mozilla-release/media/webrtc/signaling/src/sipcc/cpr/include/cpr_threads.h

    uint32_t threadId;
    union {
        void *handlePtr;
        unsigned handleInt;
    } u;
} cpr_thread_t;
++ b/mozilla-release/ipc/chromium/src/base/debug_util_posix.cc

#include "build/build_config.h"
#include "base/debug_util.h"

#define MOZ_HAVE_EXECINFO_H (defined(OS_LINUX) && defined(__GLIBC__))

#include <errno.h>
#include <fcntl.h>
++ b/mozilla-release/ipc/chromium/src/base/file_util.h

#include <windows.h>
#elif defined(ANDROID)
#include <sys/stat.h>
#define NO_FTS
#elif defined(OS_POSIX) 
#include <sys/types.h>
#include <fts.h>
#include <sys/stat.h>
#ifdef __GLIBC__
#include <fts.h>
#else
#define NO_FTS
#endif
#endif

#include <stdio.h>
++ b/mozilla-release/ipc/chromium/src/base/file_util_posix.cc

#include <errno.h>
#include <fcntl.h>
#include <fnmatch.h>
#ifndef NO_FTS
#include <fts.h>
#endif
#include <libgen.h>
#include <stdio.h>
#include <string.h>
#include <errno.h>
#include <sys/mman.h>
#define _DARWIN_USE_64_BIT_INODE // Use 64-bit inode data structures
#include <sys/stat.h>

  if (!recursive)
    return (rmdir(path_str) == 0);

#ifdef NO_FTS
  // XXX Need ftsless impl for bionic
  return false;
#else

    return false;
  }

#ifdef NO_FTS
  // XXX Need ftsless impl for bionic
  return false;
#else
++ b/mozilla-release/netwerk/sctp/src/netinet/sctp_os_userspace.h

};

#else /* !defined(Userspace_os_Windows) */
#include <sys/cdefs.h> /* needed? added from old __FreeBSD__ */
#include <sys/socket.h>
#if defined(__Userspace_os_DragonFly) || defined(__Userspace_os_FreeBSD) || defined(__Userspace_os_Linux) || defined(__Userspace_os_NetBSD) || defined(__Userspace_os_OpenBSD) || defined(ANDROID)
#include <pthread.h>
#endif
typedef pthread_mutex_t userland_mutex_t;
typedef pthread_cond_t userland_cond_t;
typedef pthread_t userland_thread_t;
++ b/mozilla-release/netwerk/sctp/src/netinet/sctp_pcb.c

 * THE POSSIBILITY OF SUCH DAMAGE.
 */

#define _BSD_SOURCE /* for IPPORT_RESERVED */
#include <netdb.h>

#ifdef __FreeBSD__
#include <sys/cdefs.h>
__FBSDID("$FreeBSD: head/sys/netinet/sctp_pcb.c 258765 2013-11-30 12:51:19Z tuexen $");
++ b/mozilla-release/netwerk/sctp/src/user_queue.h

#ifndef _USER_QUEUE_H_
#define	_USER_QUEUE_H_

#if defined(__Userspace_os_FreeBSD)
#include <sys/cdefs.h>
#endif
/*
++ b/mozilla-release/tools/profiler/platform-linux.cc

{
  MOZ_ASSERT(aContext);
  ucontext_t* pContext = reinterpret_cast<ucontext_t*>(aContext);
  /*if (!getcontext(pContext)) {
    context = pContext;
    SetSampleContext(this, aContext);
  }*/
}

void OS::SleepMicro(int microseconds)

Return to bug 531846

Line Link Here

(-)file_not_specified_in_diff (-43 / +50 lines)
0	-- a/mozilla-release/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.h	0	++ b/mozilla-release/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.h
Lines 53-61 Link Here
53	#include <config.h>	53	#include <config.h>
54	#endif	54	#endif
55		55
56	#ifdef HAVE_A_OUT_H	56	#if 0
57	#include <a.out.h>	57	#include <a.out.h>
58	#endif	58	#endif
		59
59	#ifdef HAVE_MACH_O_NLIST_H	60	#ifdef HAVE_MACH_O_NLIST_H
60	#include <mach-o/nlist.h>	61	#include <mach-o/nlist.h>
61	#endif	62	#endif
62	-- a/mozilla-release/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc	63	++ b/mozilla-release/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc
Lines 834-842 Link Here
834	// last slash, or the whole filename if there are no slashes.	834	// last slash, or the whole filename if there are no slashes.
835	string BaseFileName(const string &filename) {	835	string BaseFileName(const string &filename) {
836	// Lots of copies! basename's behavior is less than ideal.	836	// Lots of copies! basename's behavior is less than ideal.
837	char *c_filename = strdup(filename.c_str());	837	const char *c_filename = filename.c_str();
838	string base = basename(c_filename);	838	const char *p = strrchr(c_filename, '/');
839	free(c_filename);	839	string base = p ? p+1 : c_filename;
840	return base;	840	return base;
841	}	841	}
842		842
843	-- a/mozilla-release/tools/profiler/local_debug_info_symbolizer.cc	843	++ b/mozilla-release/tools/profiler/local_debug_info_symbolizer.cc
Lines 3-8 Link Here
3	* License, v. 2.0. If a copy of the MPL was not distributed with this	3	* License, v. 2.0. If a copy of the MPL was not distributed with this
4	* file, You can obtain one at http://mozilla.org/MPL/2.0/. */	4	* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
5		5
		6	#include <sys/types.h>
6	#include "PlatformMacros.h"	7	#include "PlatformMacros.h"
7	#include "nsAutoPtr.h"	8	#include "nsAutoPtr.h"
8		9
9	-- a/mozilla-release/tools/profiler/platform-linux.cc	10	++ b/mozilla-release/tools/profiler/platform-linux.cc
Lines 84-90 Link Here
84		84
85	#define SIGNAL_SAVE_PROFILE SIGUSR2	85	#define SIGNAL_SAVE_PROFILE SIGUSR2
86		86
87	#if defined(__GLIBC__)	87	#if 1
88	// glibc doesn't implement gettid(2).	88	// glibc doesn't implement gettid(2).
89	#include <sys/syscall.h>	89	#include <sys/syscall.h>
90	pid_t gettid()	90	pid_t gettid()
91	-- a/mozilla-release/tools/profiler/platform.h	91	++ b/mozilla-release/tools/profiler/platform.h
Lines 29-34 Link Here
29	#ifndef TOOLS_PLATFORM_H_	29	#ifndef TOOLS_PLATFORM_H_
30	#define TOOLS_PLATFORM_H_	30	#define TOOLS_PLATFORM_H_
31		31
		32	#include <sys/types.h>
		33
32	#ifdef ANDROID	34	#ifdef ANDROID
33	#include <android/log.h>	35	#include <android/log.h>
34	#else	36	#else
35	-- a/mozilla-release/tools/profiler/LulElf.cpp	37	++ b/mozilla-release/tools/profiler/LulElf.cpp
Lines 579-588 Link Here
579	// Return the non-directory portion of FILENAME: the portion after the	579	// Return the non-directory portion of FILENAME: the portion after the
580	// last slash, or the whole filename if there are no slashes.	580	// last slash, or the whole filename if there are no slashes.
581	string BaseFileName(const string &filename) {	581	string BaseFileName(const string &filename) {
582	// Lots of copies! basename's behavior is less than ideal.	582	// basename's behavior is less than ideal so avoid it
583	char *c_filename = strdup(filename.c_str());	583	const char *c_filename = filename.c_str();
584	string base = basename(c_filename);	584	const char *p = strrchr(c_filename, '/');
585	free(c_filename);	585	string base = p ? p+1 : c_filename;
586	return base;	586	return base;
587	}	587	}
588	-- a/mozilla-release/media/mtransport/third_party/nICEr/src/stun/addrs.c	588	++ b/mozilla-release/media/mtransport/third_party/nICEr/src/stun/addrs.c
Lines 45-51 Link Here
45	#include <sys/param.h>	45	#include <sys/param.h>
46	#include <sys/socket.h>	46	#include <sys/socket.h>
47	#ifndef ANDROID	47	#ifndef ANDROID
48	#include <sys/sysctl.h>
49	#include <sys/syslog.h>	48	#include <sys/syslog.h>
50	#else	49	#else
51	#include <syslog.h>	50	#include <syslog.h>
Lines 63-70 Link Here
63	#include <sys/sockio.h>	61	#include <sys/sockio.h>
64	#else	62	#else
65	#include <linux/sockios.h>	63	#include <linux/sockios.h>
66	#include <linux/if.h>
67	#include <linux/kernel.h>	64	#include <linux/kernel.h>
		65	#include <linux/if.h>
68	#include <linux/wireless.h>	66	#include <linux/wireless.h>
69	#ifndef ANDROID	67	#ifndef ANDROID
70	#include <linux/ethtool.h>	68	#include <linux/ethtool.h>
71	-- a/mozilla-release/memory/mozjemalloc/jemalloc.c	69	++ b/mozilla-release/memory/mozjemalloc/jemalloc.c
Lines 337-343 Link Here
337	#include <sys/time.h>	337	#include <sys/time.h>
338	#include <sys/types.h>	338	#include <sys/types.h>
339	#if !defined(MOZ_MEMORY_SOLARIS) && !defined(MOZ_MEMORY_ANDROID)	339	#if !defined(MOZ_MEMORY_SOLARIS) && !defined(MOZ_MEMORY_ANDROID)
340	#include <sys/sysctl.h>
341	#endif	340	#endif
342	#include <sys/uio.h>	341	#include <sys/uio.h>
343	#ifndef MOZ_MEMORY	342	#ifndef MOZ_MEMORY
344	-- a/mozilla-release/netwerk/sctp/src/netinet/sctp_os_userspace.h	343	++ b/mozilla-release/netwerk/sctp/src/netinet/sctp_os_userspace.h
Lines 427-433 Link Here
427	/* #include <sys/param.h> in FreeBSD defines MSIZE */	427	/* #include <sys/param.h> in FreeBSD defines MSIZE */
428	/* #include <sys/ktr.h> */	428	/* #include <sys/ktr.h> */
429	/* #include <sys/systm.h> */	429	/* #include <sys/systm.h> */
430	#if defined(__Userspace_os_Windows)	430	#if 1
431	#include <user_queue.h>	431	#include <user_queue.h>
432	#else	432	#else
433	#include <sys/queue.h>	433	#include <sys/queue.h>
434	-- a/mozilla-release/media/webrtc/signaling/src/sipcc/cpr/include/cpr_threads.h	434	++ b/mozilla-release/media/webrtc/signaling/src/sipcc/cpr/include/cpr_threads.h
Lines 30-36 Link Here
30	uint32_t threadId;	30	uint32_t threadId;
31	union {	31	union {
32	void *handlePtr;	32	void *handlePtr;
33	uint64_t handleInt;	33	unsigned handleInt;
34	} u;	34	} u;
35	} cpr_thread_t;	35	} cpr_thread_t;
36	-- a/mozilla-release/ipc/chromium/src/base/debug_util_posix.cc	36	++ b/mozilla-release/ipc/chromium/src/base/debug_util_posix.cc
Lines 5-11 Link Here
5	#include "build/build_config.h"	5	#include "build/build_config.h"
6	#include "base/debug_util.h"	6	#include "base/debug_util.h"
7		7
8	#define MOZ_HAVE_EXECINFO_H (defined(OS_LINUX) && !defined(ANDROID))	8	#define MOZ_HAVE_EXECINFO_H (defined(OS_LINUX) && defined(__GLIBC__))
9		9
10	#include <errno.h>	10	#include <errno.h>
11	#include <fcntl.h>	11	#include <fcntl.h>
12	-- a/mozilla-release/ipc/chromium/src/base/file_util.h	12	++ b/mozilla-release/ipc/chromium/src/base/file_util.h
Lines 14-23 Link Here
14	#include <windows.h>	14	#include <windows.h>
15	#elif defined(ANDROID)	15	#elif defined(ANDROID)
16	#include <sys/stat.h>	16	#include <sys/stat.h>
		17	#define NO_FTS
17	#elif defined(OS_POSIX)	18	#elif defined(OS_POSIX)
18	#include <sys/types.h>	19	#include <sys/types.h>
19	#include <fts.h>
20	#include <sys/stat.h>	20	#include <sys/stat.h>
		21	#ifdef __GLIBC__
		22	#include <fts.h>
		23	#else
		24	#define NO_FTS
		25	#endif
21	#endif	26	#endif
22		27
23	#include <stdio.h>	28	#include <stdio.h>
24	-- a/mozilla-release/ipc/chromium/src/base/file_util_posix.cc	29	++ b/mozilla-release/ipc/chromium/src/base/file_util_posix.cc
Lines 8-20 Link Here
8	#include <errno.h>	8	#include <errno.h>
9	#include <fcntl.h>	9	#include <fcntl.h>
10	#include <fnmatch.h>	10	#include <fnmatch.h>
11	#ifndef ANDROID	11	#ifndef NO_FTS
12	#include <fts.h>	12	#include <fts.h>
13	#endif	13	#endif
14	#include <libgen.h>	14	#include <libgen.h>
15	#include <stdio.h>	15	#include <stdio.h>
16	#include <string.h>	16	#include <string.h>
17	#include <sys/errno.h>	17	#include <errno.h>
18	#include <sys/mman.h>	18	#include <sys/mman.h>
19	#define _DARWIN_USE_64_BIT_INODE // Use 64-bit inode data structures	19	#define _DARWIN_USE_64_BIT_INODE // Use 64-bit inode data structures
20	#include <sys/stat.h>	20	#include <sys/stat.h>
Lines 67-73 Link Here
67	if (!recursive)	67	if (!recursive)
68	return (rmdir(path_str) == 0);	68	return (rmdir(path_str) == 0);
69		69
70	#ifdef ANDROID	70	#ifdef NO_FTS
71	// XXX Need ftsless impl for bionic	71	// XXX Need ftsless impl for bionic
72	return false;	72	return false;
73	#else	73	#else
Lines 140-146 Link Here
140	return false;	140	return false;
141	}	141	}
142		142
143	#ifdef ANDROID	143	#ifdef NO_FTS
144	// XXX Need ftsless impl for bionic	144	// XXX Need ftsless impl for bionic
145	return false;	145	return false;
146	#else	146	#else
147	-- a/mozilla-release/netwerk/sctp/src/netinet/sctp_os_userspace.h	147	++ b/mozilla-release/netwerk/sctp/src/netinet/sctp_os_userspace.h
Lines 400-410 Link Here
400	};	400	};
401		401
402	#else /* !defined(Userspace_os_Windows) */	402	#else /* !defined(Userspace_os_Windows) */
403	#include <sys/cdefs.h> /* needed? added from old __FreeBSD__ */
404	#include <sys/socket.h>	403	#include <sys/socket.h>
405	#if defined(__Userspace_os_DragonFly) \|\| defined(__Userspace_os_FreeBSD) \|\| defined(__Userspace_os_Linux) \|\| defined(__Userspace_os_NetBSD) \|\| defined(__Userspace_os_OpenBSD) \|\| defined(ANDROID)
406	#include <pthread.h>	404	#include <pthread.h>
407	#endif
408	typedef pthread_mutex_t userland_mutex_t;	405	typedef pthread_mutex_t userland_mutex_t;
409	typedef pthread_cond_t userland_cond_t;	406	typedef pthread_cond_t userland_cond_t;
410	typedef pthread_t userland_thread_t;	407	typedef pthread_t userland_thread_t;
411	-- a/mozilla-release/netwerk/sctp/src/netinet/sctp_pcb.c	408	++ b/mozilla-release/netwerk/sctp/src/netinet/sctp_pcb.c
Lines 30-35 Link Here
30	* THE POSSIBILITY OF SUCH DAMAGE.	30	* THE POSSIBILITY OF SUCH DAMAGE.
31	*/	31	*/
32		32
		33	#define _BSD_SOURCE /* for IPPORT_RESERVED */
		34	#include <netdb.h>
		35
33	#ifdef __FreeBSD__	36	#ifdef __FreeBSD__
34	#include <sys/cdefs.h>	37	#include <sys/cdefs.h>
35	__FBSDID("$FreeBSD: head/sys/netinet/sctp_pcb.c 258765 2013-11-30 12:51:19Z tuexen $");	38	__FBSDID("$FreeBSD: head/sys/netinet/sctp_pcb.c 258765 2013-11-30 12:51:19Z tuexen $");
36	-- a/mozilla-release/netwerk/sctp/src/user_queue.h	39	++ b/mozilla-release/netwerk/sctp/src/user_queue.h
Lines 31-37 Link Here
31	#ifndef _USER_QUEUE_H_	31	#ifndef _USER_QUEUE_H_
32	#define _USER_QUEUE_H_	32	#define _USER_QUEUE_H_
33		33
34	#if !defined (__Userspace_os_Windows)	34	#if defined(__Userspace_os_FreeBSD)
35	#include <sys/cdefs.h>	35	#include <sys/cdefs.h>
36	#endif	36	#endif
37	/*	37	/*
38	-- a/mozilla-release/tools/profiler/platform-linux.cc	38	++ b/mozilla-release/tools/profiler/platform-linux.cc
Lines 625-634 Link Here
625	{	625	{
626	MOZ_ASSERT(aContext);	626	MOZ_ASSERT(aContext);
627	ucontext_t* pContext = reinterpret_cast<ucontext_t*>(aContext);	627	ucontext_t* pContext = reinterpret_cast<ucontext_t*>(aContext);
628	if (!getcontext(pContext)) {	628	/*if (!getcontext(pContext)) {
629	context = pContext;	629	context = pContext;
630	SetSampleContext(this, aContext);	630	SetSampleContext(this, aContext);
631	}	631	}*/
632	}	632	}
633		633
634	void OS::SleepMicro(int microseconds)	634	void OS::SleepMicro(int microseconds)