Updated static library settings

GEMagicKit.h

@@ -23,9 +23,6 @@
  *  THE SOFTWARE.
  */
 
-#import <Foundation/Foundation.h>
-#import <MagicKit/MagicKit.h>
-
 @class GEMagicResult;
 
 @interface GEMagicKit : NSObject {

GEMagicKit.m

@@ -22,6 +22,7 @@
 *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 *  THE SOFTWARE.
 */
+
 #import "GEMagicKit.h"
 #import "GEMagicResult.h"
 #import "magic.h"

GEMagicResult.h

@@ -23,9 +23,6 @@
  *  THE SOFTWARE.
  */
 
-#import <Foundation/Foundation.h>
-#import <MagicKit/MagicKit.h>
-
 @interface GEMagicResult : NSObject {
     NSString *mimeType;
     NSString *description;

MagicKit.h

@@ -23,6 +23,5 @@
  *  THE SOFTWARE.
  */
 
-#import <Foundation/Foundation.h>
-#import <MagicKit/GEMagicKit.h>
-#import <MagicKit/GEMagicResult.h>
+#import "GEMagicKit.h"
+#import "GEMagicResult.h"

MagicKitTest/main.m

@@ -44,4 +44,4 @@ int main (int argc, const char * argv[]) {
 
     [pool drain];
     return 0;
-}
+}

MagicKit_Prefix.pch

@@ -3,5 +3,8 @@
 //
 
 #ifdef __OBJC__
-    #import <Cocoa/Cocoa.h>
+
+// #import <Cocoa/Cocoa.h> OS X
+#import <Foundation/Foundation.h>
+
 #endif

libmagic/strlcat.c

@@ -28,7 +28,7 @@
  * will be copied.  Always NUL terminates (unless siz <= strlen(dst)).
  * Returns strlen(src) + MIN(siz, strlen(initial dst)).
  * If retval >= siz, truncation occurred.
- */
+ *
 size_t
 strlcat(char *dst, const char *src, size_t siz)
 {
@@ -37,7 +37,7 @@ strlcat(char *dst, const char *src, size_t siz)
 	size_t n = siz;
 	size_t dlen;
 
-	/* Find the end of dst and adjust bytes left but don't go past end */
+	// Find the end of dst and adjust bytes left but don't go past end
 	while (n-- != 0 && *d != '\0')
 		d++;
 	dlen = d - dst;
@@ -54,5 +54,6 @@ strlcat(char *dst, const char *src, size_t siz)
 	}
 	*d = '\0';
 
-	return(dlen + (s - src));	/* count does not include NUL */
+	return(dlen + (s - src));	// count does not include NUL
 }
+*/

libmagic/strlcpy.c

@@ -26,29 +26,30 @@
  * Copy src to string dst of size siz.  At most siz-1 characters
  * will be copied.  Always NUL terminates (unless siz == 0).
  * Returns strlen(src); if retval >= siz, truncation occurred.
- */
+ *
 size_t
 strlcpy(char *dst, const char *src, size_t siz)
 {
 	char *d = dst;
 	const char *s = src;
 	size_t n = siz;
 
-	/* Copy as many bytes as will fit */
+	// Copy as many bytes as will fit
 	if (n != 0 && --n != 0) {
 		do {
 			if ((*d++ = *s++) == 0)
 				break;
 		} while (--n != 0);
 	}
 
-	/* Not enough room in dst, add NUL and traverse rest of src */
+	// Not enough room in dst, add NUL and traverse rest of src
 	if (n == 0) {
 		if (siz != 0)
-			*d = '\0';		/* NUL-terminate dst */
+			*d = '\0';		// NUL-terminate dst
 		while (*s++)
 			;
 	}
 
-	return(s - src - 1);	/* count does not include NUL */
+	return(s - src - 1);	// count does not include NUL
 }
+*/