[Bf-blender-cvs] [f138666] master: cleanup: Mac #include

Mike Erwin noreply at git.blender.org
Tue Mar 17 06:23:46 CET 2015


Commit: f138666f684a6055679f54d4c091201345a9cf8b
Author: Mike Erwin
Date:   Tue Mar 17 01:18:52 2015 -0400
Branches: master
https://developer.blender.org/rBf138666f684a6055679f54d4c091201345a9cf8b

cleanup: Mac #include

Don’t need all of Cocoa, or any of Carbon here.

===================================================================

M	intern/ghost/intern/GHOST_SystemPathsCocoa.mm

===================================================================

diff --git a/intern/ghost/intern/GHOST_SystemPathsCocoa.mm b/intern/ghost/intern/GHOST_SystemPathsCocoa.mm
index 50ad91e..36ae534 100644
--- a/intern/ghost/intern/GHOST_SystemPathsCocoa.mm
+++ b/intern/ghost/intern/GHOST_SystemPathsCocoa.mm
@@ -24,14 +24,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-#import <Cocoa/Cocoa.h>
-
-/*For the currently not ported to Cocoa keyboard layout functions (64bit & 10.6 compatible)*/
-#include <Carbon/Carbon.h>
-
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/sysctl.h>
+#import <Foundation/Foundation.h>
 
 #include "GHOST_SystemPathsCocoa.h"




More information about the Bf-blender-cvs mailing list