Changeset 79546

Timestamp:

06/17/11 11:53:16 (4 years ago)

Author:

cal@…

Message:

rev-upgrade: Moved fileIsBinary to conditional MACH section, added static keyword and comment

File:

• branches/gsoc11-rev-upgrade/base/src/pextlib1.0/Pextlib.c (modified) (4 diffs)

branches/gsoc11-rev-upgrade/base/src/pextlib1.0/Pextlib.c

@@ -55 +55 @@
 #include <unistd.h>
 
-/*
-  people use this on non-mac systems
-  #include <mach-o/loader.h>
-  #include <mach-o/fat.h>
-*/
-#define MH_MAGIC    (0xfeedface)
-#define MH_MAGIC_64 (0xfeedfacf)
-#define FAT_MAGIC   (0xcafebabe)
+#ifdef __MACH__
+#include <mach-o/loader.h>
+#include <mach-o/fat.h>
+#endif
 
 #include <tcl.h>
@@ -474 +470 @@
 }
 
-int fileIsBinaryCmd(ClientData clientData UNUSED, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) {
+#ifdef __MACH__
+/**
+ * Tcl function to determine whether a file given by path is binary (in terms of being Mach-O)
+ * Defined on Mac-Systems only, because the necessary headers are only available there.
+ *
+ * Synopsis: fileIsBinary filename
+ */
+static int fileIsBinaryCmd(ClientData clientData UNUSED, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) {
     const char *path;
     FILE *file;
@@ -562 +565 @@
     return TCL_OK;
 }
-
+#endif
 
 int Pextlib_Init(Tcl_Interp *interp)
@@ -596 +599 @@
     Tcl_CreateObjCommand(interp, "unsetenv", UnsetEnvCmd, NULL, NULL);
     Tcl_CreateObjCommand(interp, "lchown", lchownCmd, NULL, NULL);
+    Tcl_CreateObjCommand(interp, "realpath", RealpathCmd, NULL, NULL);
+#ifdef __MACH__
     Tcl_CreateObjCommand(interp, "fileIsBinary", fileIsBinaryCmd, NULL, NULL);
-    Tcl_CreateObjCommand(interp, "realpath", RealpathCmd, NULL, NULL);
+#endif
 
     Tcl_CreateObjCommand(interp, "readline", ReadlineCmd, NULL, NULL);