Skip to content

Commit

Permalink
Merge branch 'master' into landonf-ha14-merge-ha-fork
Browse files Browse the repository at this point in the history
  • Loading branch information
landonf committed Jul 22, 2013
2 parents b62b187 + 092fe09 commit 25cd944
Show file tree
Hide file tree
Showing 27 changed files with 28 additions and 26 deletions.
2 changes: 2 additions & 0 deletions CrashReporter.xcodeproj/project.pbxproj
Expand Up @@ -3990,6 +3990,7 @@
GCC_C_LANGUAGE_STANDARD = c99;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREFIX_HEADER = "$(SRCROOT)/Source/PLCrashReporterNamespace.h";
GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
HEADER_SEARCH_PATHS = "\"$(SRCROOT)/Dependencies/protobuf-2.0.3/include\"";
MACOSX_DEPLOYMENT_TARGET = 10.5;
ONLY_ACTIVE_ARCH = NO;
Expand All @@ -4015,6 +4016,7 @@
GCC_C_LANGUAGE_STANDARD = c99;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_PREFIX_HEADER = "$(SRCROOT)/Source/PLCrashReporterNamespace.h";
GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
HEADER_SEARCH_PATHS = (
"\"$(SRCROOT)/$(DERIVED_FILES_DIR)\"",
"\"$(SRCROOT)/Dependencies/protobuf-2.0.3/include\"",
Expand Down
2 changes: 1 addition & 1 deletion Source/CrashReporter.h
Expand Up @@ -291,4 +291,4 @@ typedef enum {
* Radar: rdar://12939497 RFE: Provide mach_exc.defs for iOS
*
* At the time of this writing, the radar remains open/unresolved.
*/
*/
2 changes: 1 addition & 1 deletion Source/Fuzz/fuzz-main.m
Expand Up @@ -28,4 +28,4 @@ int main (int argc, char *argv[]) {
[report release];

[pool release];
}
}
2 changes: 1 addition & 1 deletion Source/PLCrashAsync.c
Expand Up @@ -543,4 +543,4 @@ bool plcrash_async_file_close (plcrash_async_file_t *file) {

/**
* @} plcrash_async
*/
*/
2 changes: 1 addition & 1 deletion Source/PLCrashAsyncImageList.c
Expand Up @@ -253,4 +253,4 @@ plcrash_async_image_t *plcrash_async_image_list_next (plcrash_async_image_list_t

/**
* @}
*/
*/
2 changes: 1 addition & 1 deletion Source/PLCrashAsyncMObject.c
Expand Up @@ -480,4 +480,4 @@ void plcrash_async_mobject_free (plcrash_async_mobject_t *mobj) {

/**
* @} plcrash_async
*/
*/
2 changes: 1 addition & 1 deletion Source/PLCrashAsyncMObjectTests.m
Expand Up @@ -203,4 +203,4 @@ - (void) testReadHandling {
plcrash_async_mobject_free(&mobj);
}

@end
@end
2 changes: 1 addition & 1 deletion Source/PLCrashAsyncMachOImage.c
Expand Up @@ -929,4 +929,4 @@ void plcrash_nasync_macho_free (plcrash_async_macho_t *image) {

/**
* @} pl_async_macho
*/
*/
2 changes: 1 addition & 1 deletion Source/PLCrashAsyncMachOImageTests.m
Expand Up @@ -415,4 +415,4 @@ - (void) testFindSymbolByName {
STAssertEquals((pl_vm_address_t) localIMP, pc, @"Returned incorrect symbol address");
}

@end
@end
2 changes: 1 addition & 1 deletion Source/PLCrashAsyncSignalInfo.c
Expand Up @@ -171,4 +171,4 @@ const char *plcrash_async_signal_signame (int signal) {

/**
* @} plcrash_async_signal_info
*/
*/
2 changes: 1 addition & 1 deletion Source/PLCrashAsyncSignalInfo.h
Expand Up @@ -55,4 +55,4 @@ const char *plcrash_async_signal_sigcode (int signal, int si_code);
}
#endif

#endif /* PLCRASH_ASYNC_SIGNAL_INFO_H */
#endif /* PLCRASH_ASYNC_SIGNAL_INFO_H */
2 changes: 1 addition & 1 deletion Source/PLCrashAsyncTests.m
Expand Up @@ -287,4 +287,4 @@ - (void) testBufferedWrite {
[input close];
}

@end
@end
2 changes: 1 addition & 1 deletion Source/PLCrashAsyncThread_current.S
Expand Up @@ -218,4 +218,4 @@ pop {r7, pc}

#error Unsupported Platform

#endif
#endif
2 changes: 1 addition & 1 deletion Source/PLCrashAsyncThread_current_defs.h
Expand Up @@ -67,4 +67,4 @@ extern "C" {
}
#endif

#endif /* PLCRASH_ASYNC_THREAD_CURRENT_DEFS_H */
#endif /* PLCRASH_ASYNC_THREAD_CURRENT_DEFS_H */
2 changes: 1 addition & 1 deletion Source/PLCrashFrameWalker.h
Expand Up @@ -176,4 +176,4 @@ void plframe_cursor_free(plframe_cursor_t *cursor);
}
#endif

#endif /* PLCRASH_FRAMEWALKER_H */
#endif /* PLCRASH_FRAMEWALKER_H */
2 changes: 1 addition & 1 deletion Source/PLCrashLogWriterEncoding.h
Expand Up @@ -55,4 +55,4 @@ size_t plcrash_writer_pack (plcrash_async_file_t *file, uint32_t field_id, PLPro
}
#endif

#endif /* PLCRASH_LOG_WRITER_ENCODING_H */
#endif /* PLCRASH_LOG_WRITER_ENCODING_H */
2 changes: 1 addition & 1 deletion Source/PLCrashReportApplicationInfo.h
Expand Up @@ -50,4 +50,4 @@
*/
@property(nonatomic, readonly) NSString *applicationVersion;

@end
@end
2 changes: 1 addition & 1 deletion Source/PLCrashReportProcessInfo.h
Expand Up @@ -100,4 +100,4 @@
/** The process' native execution status. If false, the process is being run via process-level CPU emulation (such as Rosetta). */
@property(nonatomic, readonly) BOOL native;

@end
@end
2 changes: 1 addition & 1 deletion Source/PLCrashReportRegisterInfo.h
Expand Up @@ -49,4 +49,4 @@
*/
@property(nonatomic, readonly) uint64_t registerValue;

@end
@end
2 changes: 1 addition & 1 deletion Source/PLCrashReportRegisterInfo.m
Expand Up @@ -55,4 +55,4 @@ - (void) dealloc {
@synthesize registerName = _registerName;
@synthesize registerValue = _registerValue;

@end
@end
2 changes: 1 addition & 1 deletion Source/PLCrashReportStackFrameInfo.h
Expand Up @@ -49,4 +49,4 @@
* This may be unavailable, and this property will be nil. */
@property(nonatomic, readonly) PLCrashReportSymbolInfo *symbolInfo;

@end
@end
2 changes: 1 addition & 1 deletion Source/PLCrashReportStackFrameInfo.m
Expand Up @@ -58,4 +58,4 @@ - (void) dealloc {
[super dealloc];
}

@end
@end
2 changes: 1 addition & 1 deletion Source/PLCrashReporter.h
Expand Up @@ -101,4 +101,4 @@ typedef struct PLCrashReporterCallbacks {

- (void) setCrashCallbacks: (PLCrashReporterCallbacks *) callbacks;

@end
@end
2 changes: 1 addition & 1 deletion Source/PLCrashReporterNSError.h
Expand Up @@ -31,4 +31,4 @@

void plcrash_populate_error (NSError **error, PLCrashReporterError code, NSString *description, NSError *cause);
void plcrash_populate_mach_error (NSError **error, kern_return_t kr, NSString *description);
void plcrash_populate_posix_error (NSError **error, int errnoVal, NSString *description);
void plcrash_populate_posix_error (NSError **error, int errnoVal, NSString *description);
2 changes: 1 addition & 1 deletion Source/PLCrashReporterNamespace.h
Expand Up @@ -67,4 +67,4 @@
#define PLCrashReporterErrorDomain PLNS(PLCrashReporterErrorDomain)
#define PLCrashReporterException PLNS(PLCrashReporterException)

#endif
#endif
2 changes: 1 addition & 1 deletion Source/PLCrashSysctl.c
Expand Up @@ -123,4 +123,4 @@ bool plcrash_sysctl_int (const char *name, int *result) {

/**
* @}
*/
*/
2 changes: 1 addition & 1 deletion Source/PLCrashSysctl.h
Expand Up @@ -57,4 +57,4 @@ bool plcrash_sysctl_int (const char *name, int *result);
}
#endif

#endif /* PLCRASH_SYSCTL_H */
#endif /* PLCRASH_SYSCTL_H */

0 comments on commit 25cd944

Please sign in to comment.