Deleted OS X code specificities

VERSION

@@ -1 +1 @@
-0.6.0
+0.7.0

src/ecopcr.c

@@ -6,7 +6,7 @@
 #include <getopt.h>
 
 
-#define VERSION "0.6.0"
+#define VERSION "0.7.0"
 
 
 /* ----------------------------------------------- */
@@ -26,7 +26,7 @@ static void PrintHelp()
         PP      "-a    : Salt concentration in M for Tm computation (default 0.05 M)\n\n");
         PP      "-c    : Consider that the database sequences are [c]ircular\n\n");
         PP      "-d    : [D]atabase : to match the expected format, the database\n");
-        PP      "        has to be formated first by the ecoPCRFormat.py program located.\n");
+        PP      "        has to be formatted first by the ecoPCRFormat.py program located.\n");
         PP      "        in the tools directory.\n");
         PP      "        ecoPCRFormat.py creates three file types :\n");
         PP      "            .sdx : contains the sequences\n");

src/global.mk

@@ -1,14 +1,13 @@
-MACHINE=MAC_OS_X
 LIBPATH= -Llibapat -LlibecoPCR -Llibthermo
-MAKEDEPEND = gcc -D$(MACHINE) -M $(CPPFLAGS) -o $*.d $<
+MAKEDEPEND = gcc -M $(CPPFLAGS) -o $*.d $<
 
 CC=gcc
-CFLAGS= -W -Wall -O2 -g
+CFLAGS= -O3 -w
 
 default: all
 
 %.o: %.c
-	$(CC) -D$(MACHINE) $(CFLAGS) -c -o $@ $<
+	$(CC) $(CFLAGS) -c -o $@ $<
 
 %.P : %.c
 	$(MAKEDEPEND)

src/libapat/Gtypes.h

@@ -27,13 +27,9 @@
 #define PROTO   1                       /* prototypes flag              */
 #endif
 
-#ifdef MAC_OS_C
+
-#define Vrai    true                    /* TC boolean values            */
-#define Faux    false                   /*                              */
-#else
 #define Vrai    0x1                     /* bool values  = TRUE          */
 #define Faux    0x0                     /*              = FALSE         */
-#endif
 
 #define Nil     NULL                    /* nil pointer                  */
 
@@ -42,28 +38,7 @@
 #define kBigUInt16      0xffff          /* plus grand 16 bits ~signe    */
 #define kBigUInt32      0xffffffff      /* plus grand 32 bits ~signe    */
 
-#ifdef MAC_OS_C
-/* ==================================================== */
-/*  Types (for Macintosh ThinK C || MWerks)             */
-/* ==================================================== */
 
-                                        /* --- specific sizes --------- */
-typedef long            Int32;          /* Int32  = 32 bits signe       */
-typedef unsigned long   UInt32;         /* UInt32 = 32 bits ~signe      */
-typedef short           Int16;          /* Int16  = 16 bits signe       */
-typedef unsigned short  UInt16;         /* UInt32 = 16 bits ~signe      */
-typedef char            Int8;           /* Int8   = 8 bits signe        */
-typedef unsigned char   UInt8;          /* UInt8  = 8 bits ~signe       */
-
-                                        /* --- default types ---------- */
-
-typedef Boolean         Bool;           /* booleen                      */
-
-typedef long            Int;            /* 'natural' int (>= 32 bits)   */
-
-typedef void            *Ptr;           /* pointeur                     */
-
-#elif ((defined SUN) || (defined SGI) || (defined UNIX))
 /* ==================================================== */
 /*  Types (for Sun & Iris - 32 bits machines)           */
 /* ==================================================== */
@@ -84,14 +59,7 @@ typedef int             Int;            /* 'natural' int (>= 32 bits)   */
 
 typedef void            *Ptr;           /* pointeur                     */
 
-#else 
-/* ==================================================== */
-/*  Types (for undefined machines)                      */
-/* ==================================================== */
 
-#error undefined MACHINE <please edit Gmach.h>
-
-#endif
 
 /* ==================================================== */
 /*  special macro for prototypes                        */