Module Name: krb5 Committed By: raeburn Date: Tue Dec 31 09:21:12 UTC 2002 Modified Files: krb5/src/util/profile/ChangeLog krb5/src/util/profile/prof_file.c krb5/src/util/profile/prof_init.c krb5/src/util/profile/prof_int.h krb5/src/util/profile/prof_tree.c krb5/src/util/profile/profile.exp krb5/src/util/profile/profile.hin Added Files: Removed Files: Log Message Merge some Mac-specific changes from meeroh's branch: * profile.hin: Don't test MACINTOSH any more. On Mac OS X, include TargetConditionals.h, set some pragmas, define COPY_RESOURCE_FORK, and error out if TARGET_RT_MAC_CFM is defined; don't set the old m68k CFM pragmas. Always use PROFILE_USES_PATHS code, don't test or define it. (FSp_profile_init, FSp_profile_init_path): Declare, on Mac OS X. * prof_int.h (NO_SYS_TYPES_H, NO_SYS_STAT_H) [macintosh]: Don't define these. * prof_file.c: Always inclued sys/types.h and sys/stat.h. (GetMacOSTempFilespec): Deleted. (profile_flush_file_data) [COPY_RESOURCE_FORK]: Copy Mac resource fork from old file to new before renaming. (rw_access, profile_update_file_data, profile_flush_file_data, profile_free_file_data): Assume PROFILE_USES_PATHS, don't test. * prof_init.c (profile_ser_size, profile_ser_externalize, profile_ser_internalize): Likewise. (FSp_profile_init, FSp_profile_init_path): Define, on MacOS X. * profile.exp: Add FSp_* functions. * prof_file.c (r_access): New function. (profile_open_file): Use it. To generate a diff of this commit: cvs diff -r1.122 -r1.123 krb5/src/util/profile/ChangeLog cvs diff -r1.26 -r1.27 krb5/src/util/profile/prof_file.c cvs diff -r1.30 -r1.31 krb5/src/util/profile/prof_init.c cvs diff -r1.26 -r1.27 krb5/src/util/profile/prof_int.h cvs diff -r1.21 -r1.22 krb5/src/util/profile/prof_tree.c cvs diff -r1.3 -r1.4 krb5/src/util/profile/profile.exp cvs diff -r1.30 -r1.31 krb5/src/util/profile/profile.hin