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

[Ken Raeburn]

Index: emacs/src/mac.c
diff -c emacs/src/mac.c:1.5 emacs/src/mac.c:1.6
*** emacs/src/mac.c:1.5 Mon Jun 17 02:06:03 2002
--- emacs/src/mac.c     Sun Jul 14 20:00:36 2002
***************
*** 2048,2054 ****
  
          if (NILP (path))
            return -1;
!         if (posix_to_mac_pathname (XSTRING (path)->data, tempmacpathname,
                                    MAXPATHLEN+1) == 0)
            return -1;
        }
--- 2048,2054 ----
  
          if (NILP (path))
            return -1;
!         if (posix_to_mac_pathname (SDATA (path), tempmacpathname,
                                    MAXPATHLEN+1) == 0)
            return -1;
        }
***************
*** 2529,2535 ****
  
    CHECK_STRING (script);
    
!   status = do_applescript (XSTRING (script)->data, &result);
    if (status)
      {
        if (!result)
--- 2529,2535 ----
  
    CHECK_STRING (script);
    
!   status = do_applescript (SDATA (script), &result);
    if (status)
      {
        if (!result)
***************
*** 2566,2572 ****
  
    CHECK_STRING (mac_filename);
    
!   if (mac_to_posix_pathname (XSTRING (mac_filename)->data, posix_filename,
                           MAXPATHLEN))
      return build_string (posix_filename);
    else
--- 2566,2572 ----
  
    CHECK_STRING (mac_filename);
    
!   if (mac_to_posix_pathname (SDATA (mac_filename), posix_filename,
                           MAXPATHLEN))
      return build_string (posix_filename);
    else
***************
*** 2584,2590 ****
  
    CHECK_STRING (posix_filename);
    
!   if (posix_to_mac_pathname (XSTRING (posix_filename)->data, mac_filename,
                           MAXPATHLEN))
      return build_string (mac_filename);
    else
--- 2584,2590 ----
  
    CHECK_STRING (posix_filename);
    
!   if (posix_to_mac_pathname (SDATA (posix_filename), mac_filename,
                           MAXPATHLEN))
      return build_string (mac_filename);
    else
***************
*** 2670,2678 ****
  
    CHECK_STRING (value);
    
!   len = XSTRING (value)->size;
    buf = (char *) alloca (len+1);
!   bcopy (XSTRING (value)->data, buf, len);
    buf[len] = '\0';
    
    /* convert to Mac-style eol's before sending to clipboard */
--- 2670,2678 ----
  
    CHECK_STRING (value);
    
!   len = SCHARS (value);
    buf = (char *) alloca (len+1);
!   bcopy (SDATA (value), buf, len);
    buf[len] = '\0';
    
    /* convert to Mac-style eol's before sending to clipboard */