shithub: opus-tools

Info  •  Files  •  Log  •  Branches

Drop the HAVE_GETOPT_H guard

If this was really needed the other tools would be failing to compile.
And if they are, we should fix that at the cause for all of them.

--- a/Makefile.am

+++ b/Makefile.am

@@ -6,7 +6,7 @@

 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/win32

-AM_CFLAGS = $(OGG_CFLAGS) $(Opus_CFLAGS) -DOPUSTOOLS -D_FORTIFY_SOURCE=2 -DHAVE_GETOPT_H -DSPX_RESAMPLE_EXPORT= -DRANDOM_PREFIX=opustools -DOUTSIDE_SPEEX -DFLOATING_POINT

+AM_CFLAGS = $(OGG_CFLAGS) $(Opus_CFLAGS) -DOPUSTOOLS -D_FORTIFY_SOURCE=2 -DSPX_RESAMPLE_EXPORT= -DRANDOM_PREFIX=opustools -DOUTSIDE_SPEEX -DFLOATING_POINT

 bin_PROGRAMS = opusenc opusdec opusinfo

 noinst_PROGRAMS = opusrtp

--- a/Makefile.unix

+++ b/Makefile.unix

@@ -2,7 +2,7 @@

 #Run ./configure to run autotools/autoconf.

 #This makefile exists as a fallback where autotools isn't working.

 #CC=gcc

-CFLAGS := -DPACKAGE='"opus-tools"' -DVERSION='"0.1.6git"' -DOPUSTOOLS -O2 -g -c -Wall -Wextra -DHAVE_GETOPT_H -DSPX_RESAMPLE_EXPORT= -DRANDOM_PREFIX=opustools -DOUTSIDE_SPEEX -DFLOATING_POINT $(CFLAGS)

+CFLAGS := -DPACKAGE='"opus-tools"' -DVERSION='"0.1.6git"' -DOPUSTOOLS -O2 -g -c -Wall -Wextra -DSPX_RESAMPLE_EXPORT= -DRANDOM_PREFIX=opustools -DOUTSIDE_SPEEX -DFLOATING_POINT $(CFLAGS)

 INCLUDES := -I../opus/include -I/usr/include/FLAC

 ifneq (,$(findstring mingw,$(CC)))

--- a/src/opusdec.c

+++ b/src/opusdec.c

@@ -35,12 +35,8 @@

 #if !defined WIN32 && !defined _WIN32

 #include <unistd.h>

 #endif

-#ifdef HAVE_GETOPT_H

+

 #include <getopt.h>

-#endif

-/*#ifndef HAVE_GETOPT_LONG

-#include "getopt_win.h"

-#endif*/

 #include <stdlib.h>

 #include <limits.h>

 #include <string.h>

--- a/win32/config.h

+++ b/win32/config.h

@@ -7,7 +7,6 @@

 #define inline __inline

 #define alloca _alloca

 #define getpid _getpid

-#define HAVE_GETOPT_H         1

 #define USE_ALLOCA            1

 #define FLOATING_POINT        1

 #define SPX_RESAMPLE_EXPORT