Made public header 'ddcci.h' non platform/configure dependent

Author: kravemir

src/ddccontrol/main.c

@@ -20,6 +20,7 @@
 
 #include "config.h"
 #include "ddcci.h"
+#include "internal.h"
 #include "monitor_db.h"
 
 #include <stdio.h>

src/gddccontrol/fspatterns.c

@@ -19,6 +19,8 @@
  ***************************************************************************/
 
 #include "notebook.h"
+#include "internal.h"
+
 #include <string.h>
 
 static GtkWidget* fs_patterns_window = NULL;

src/gddccontrol/gprofile.c

@@ -20,6 +20,7 @@
 
 #include "config.h"
 #include "notebook.h"
+#include "internal.h"
 
 #include <string.h>
 

src/gddccontrol/main.c

@@ -27,6 +27,7 @@
 #define IDLE_TIMEOUT 60
 
 #include "notebook.h"
+#include "internal.h"
 
 GtkWidget* table;
 

src/gddccontrol/notebook.c

@@ -29,6 +29,7 @@
 #include <math.h>
 
 #include "notebook.h"
+#include "internal.h"
 
 #define GTK_FILL_EXPAND (GtkAttachOptions)(GTK_FILL|GTK_EXPAND)
 

src/lib/Makefile.am

@@ -11,7 +11,7 @@ $(pkgconfig_DATA): $(srcdir)/ddccontrol.pc.in $(top_builddir)/config.status
 lib_LTLIBRARIES = libddccontrol.la
 
 libddccontrol_la_SOURCES = ddcci.c ddcci.h monitor_db.c monitor_db.h \
-   ddcpci-ipc.h i2c-dev.h conf.c conf.h amd_adl.c amd_adl.h
+   ddcpci-ipc.h i2c-dev.h conf.c conf.h amd_adl.c amd_adl.h internal.h
 
 libddccontrol_la_LIBADD = $(LIBXML2_LDFLAGS)
 AM_CFLAGS = $(LIBXML2_CFLAGS)

src/lib/amd_adl.c

@@ -40,6 +40,7 @@
 
 #include "amd_adl.h"
 #include "ddcci.h"
+#include "internal.h"
 
 #if 1
 # define D(x)

src/lib/conf.c

@@ -38,6 +38,7 @@
 #include <libxml/xmlwriter.h>
 
 #include "conf.h"
+#include "internal.h"
 
 #define RETRYS 3 // number of read retrys
 

src/lib/ddcci.c

@@ -38,6 +38,7 @@
 #include <sys/stat.h>
 
 #include "ddcci.h"
+#include "internal.h"
 #include "amd_adl.h"
 
 #include "conf.h"

src/lib/ddcci.h

@@ -21,19 +21,6 @@
 #ifndef DDCCI_H
 #define DDCCI_H
 
-#include "config.h"
-
-#ifdef HAVE_GETTEXT
-#include <libintl.h>
-#include <locale.h>
-#define _(String) gettext (String)
-#define gettext_noop(String) String
-#define N_(String) gettext_noop (String)
-#else
-#define _(String) String
-#define N_(String) String
-#endif
-
 #include <time.h>
 #include <sys/time.h>
 
@@ -63,9 +50,7 @@ struct caps {
 struct monitor {
 	int fd;
 	unsigned int addr;
-#ifdef HAVE_AMDADL
 	int adl_adapter, adl_display;
-#endif
 	char pnpid[8];
 	unsigned char digital; /* 0 - digital, 1 - analog */
 	struct timeval last;
@@ -76,12 +61,8 @@ struct monitor {
 
 	enum {
 		dev
-#ifdef HAVE_DDCPCI
 		,pci
-#endif
-#ifdef HAVE_AMDADL
 		,type_adl
-#endif
 	} type;
 	int probing; /* are we probing? */
 

src/lib/internal.h

@@ -0,0 +1,35 @@
+/*
+    ddc/ci interface functions header
+    Copyright(c) 2004 Oleg I. Vdovikin ([email protected])
+    Copyright(c) 2004-2005 Nicolas Boichat ([email protected])
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+*/
+
+#ifndef DDCCI_INTERNAL_H
+#define DDCCI_INTERNAL_H
+
+#ifdef HAVE_GETTEXT
+#include <libintl.h>
+#include <locale.h>
+#define _(String) gettext (String)
+#define gettext_noop(String) String
+#define N_(String) gettext_noop (String)
+#else
+#define _(String) String
+#define N_(String) String
+#endif
+
+#endif //DDCCI_INTERNAL_H

src/lib/monitor_db.c

@@ -30,6 +30,7 @@
 
 #include "monitor_db.h"
 #include "ddcci.h"
+#include "internal.h"
 
 /* Localize, and alloc in libxml */
 #ifdef HAVE_GETTEXT