shithub: sox

Info  •  Files  •  Log  •  Branches

Include local getopt.h last in case someone includes a system
header file that defines getopt items.  It can cause errors if
our aliases messes with system header files.

--- a/src/sox.c

+++ b/src/sox.c

@@ -70,8 +70,8 @@

 #include <fcntl.h>

 #endif

-/* We are playing games with getopt aliases so this needs to be included after unistd.h

- * to prevent aliasing oS's version of getopt.

+/* We are playing games with getopt aliases so this needs to be included after

+ * unistd.h to prevent aliasing OS's version of getopt.

  */

 #include "getopt.h"

--- a/src/spectrogram.c

+++ b/src/spectrogram.c

@@ -26,10 +26,14 @@

 #include "sox_i.h"

 #include "fft4g.h"

-#include "getopt.h"

 #include <assert.h>

 #include <math.h>

 #include <png.h>

+

+/* we are playing games with getopt aliases so this needs to be included

+ * after system header files to prevent aliasing OS's version of getopt.

+ */

+#include "getopt.h"

 #define malloc              lsx_malloc

 #define calloc              lsx_calloc