summaryrefslogtreecommitdiff
blob: 156cb4bbdfac4826b482974a657abe7a644c270f (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
--- a/src/Param.h
+++ b/src/Param.h
@@ -28,26 +28,14 @@
 #include <vector>
 #include <string>
 #include <string.h>
+#include <unistd.h>
 #ifdef HAVE_STRINGS_H
 #include <strings.h>
 #endif
-// MacOS-X has getopt() defined is stdlib and the library in the libSystem
-#ifndef __APPLE__
-#ifdef HAVE_GETOPT_H
-#include <getopt.h>
-#else
-#ifndef HAVE_GETOPT
-#include "getopt.h"
-#endif
-#endif
-#endif
 
 #include "Const.h"
 #include "System.h"
 
-extern char   *optarg;   
-extern int     optind;
-
 
 class ltstr
 {
--- a/src/SensorPlugins/MarkovIMM/GetData/CEM.cc
+++ b/src/SensorPlugins/MarkovIMM/GetData/CEM.cc
@@ -22,18 +22,11 @@
 #include "../../../../config.h"
 #endif
 
-#ifdef HAVE_GETOPT_H
-#include <getopt.h>
-#else
-#ifndef HAVE_GETOPT
-#include "../../../getopt.h"
-#endif
-#endif
-
 #include "../../../System.cc"
 #include "../../../Const.h"
 #include "../../0_SensorTk/EndianConv.h"
 #include "strarray.h"
+#include "unistd.h"
 #include <vector>
 
 // Constantes
--- a/src/SensorPlugins/MarkovIMM/GetData/TrainIMM.cc
+++ b/src/SensorPlugins/MarkovIMM/GetData/TrainIMM.cc
@@ -22,18 +22,11 @@
 #include "../../../../config.h"
 #endif
 
-#ifdef HAVE_GETOPT_H
-#include <getopt.h>
-#else
-#ifndef HAVE_GETOPT
-#include "../../../getopt.h"
-#endif
-#endif
-
 #include "../../../System.cc"
 #include "../../../Const.h"
 #include "../../0_SensorTk/EndianConv.h"
 #include "strarray.h"
+#include "unistd.h"
 
 
 // Constantes