# HG changeset patch
# User YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
# Date 1156662563 0
# Node ID bb89b5bbed540db8b979e93016272969cc87278d
# Parent  607718436ce2047a49d25c69266b0dbc564a8b1f
(create_apple_event_from_event_ref, select)
(Fmac_get_file_creator, Fmac_get_file_type, Fmac_set_file_creator)
(Fmac_set_file_type, cfstring_create_normalized)
(mac_get_system_locale, select_and_poll_event, sys_select): Use
OSStatus instead of OSErr.

diff -r 607718436ce2 -r bb89b5bbed54 src/mac.c
--- a/src/mac.c	Sun Aug 27 07:09:14 2006 +0000
+++ b/src/mac.c	Sun Aug 27 07:09:23 2006 +0000
@@ -831,7 +831,7 @@
   return err;
 }
 
-OSErr
+OSStatus
 create_apple_event_from_event_ref (event, num_params, names, types, result)
      EventRef event;
      UInt32 num_params;
@@ -839,7 +839,7 @@
      EventParamType *types;
      AppleEvent *result;
 {
-  OSErr err;
+  OSStatus err;
   UInt32 i, size;
   CFStringRef string;
   CFDataRef data;
@@ -2424,7 +2424,7 @@
   SELECT_TYPE *efds;
   struct timeval *timeout;
 {
-  OSErr err;
+  OSStatus err;
 #if TARGET_API_MAC_CARBON
   EventTimeout timeout_sec =
     (timeout
@@ -4192,7 +4192,7 @@
      (filename)
      Lisp_Object filename;
 {
-  OSErr	status;
+  OSStatus status;
 #ifdef MAC_OSX
   FSRef fref;
 #else
@@ -4246,7 +4246,7 @@
      (filename)
      Lisp_Object filename;
 {
-  OSErr	status;
+  OSStatus status;
 #ifdef MAC_OSX
   FSRef fref;
 #else
@@ -4302,7 +4302,7 @@
      (filename, code)
      Lisp_Object filename, code;
 {
-  OSErr	status;
+  OSStatus status;
 #ifdef MAC_OSX
   FSRef fref;
 #else
@@ -4362,7 +4362,7 @@
      (filename, code)
      Lisp_Object filename, code;
 {
-  OSErr	status;
+  OSStatus status;
 #ifdef MAC_OSX
   FSRef fref;
 #else
@@ -4775,7 +4775,7 @@
       UnicodeMapping map;
       CFIndex length;
       UniChar *in_text, *buffer = NULL, *out_buf = NULL;
-      OSErr err = noErr;
+      OSStatus err = noErr;
       ByteCount out_read, out_size, out_len;
 
       map.unicodeEncoding = CreateTextEncoding (kTextEncodingUnicodeDefault,
@@ -4910,7 +4910,7 @@
 static Lisp_Object
 mac_get_system_locale ()
 {
-  OSErr err;
+  OSStatus err;
   LangCode lang;
   RegionCode region;
   LocaleRef locale;
@@ -4987,7 +4987,7 @@
      struct timeval *timeout;
 {
   int r;
-  OSErr err;
+  OSStatus err;
 
   r = select (n, rfds, wfds, efds, timeout);
   if (r != -1)
@@ -5017,7 +5017,7 @@
      SELECT_TYPE *efds;
      struct timeval *timeout;
 {
-  OSErr err;
+  OSStatus err;
   int i, r;
   EMACS_TIME select_timeout;