[Emacs-diffs] Changes to emacs/src/mac.c,v

[YAMAMOTO Mitsuharu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     YAMAMOTO Mitsuharu <mituharu>   06/08/27 07:09:23

Index: mac.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/mac.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -b -r1.64 -r1.65
--- mac.c       12 Jul 2006 13:19:33 -0000      1.64
+++ mac.c       27 Aug 2006 07:09:23 -0000      1.65
@@ -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;