Inline CONFFOPTCELLS into conffoptcells definition

The values in CONFFOPTCELLS are dpkg specific, and not to be found in
libdpkg so there's no much point in defining the macro there. Also this
makes for clearer code.

lib/dpkg.h

@@ -100,12 +100,6 @@ DPKG_BEGIN_DECLS
 #define MD5HASHLEN           32
 #define MAXTRIGDIRECTIVE     256
 
-#define CONFFOPTCELLS  /* int conffoptcells[2] {* 1= user edited *}              \
-                                           [2] {* 1= distributor edited *} = */  \
-                                  /* dist not */     /* dist edited */           \
-   /* user did not edit */    {     cfo_keep,           cfo_install    },        \
-   /* user did edit     */    {     cfo_keep,         cfo_prompt_keep  }
-
 #define ARCHIVE_FILENAME_PATTERN "*.deb"
 
 #define BACKEND		"dpkg-deb"

src/configure.c

@@ -49,7 +49,11 @@
 #include "filesdb.h"
 #include "main.h"
 
-static int conffoptcells[2][2] = { CONFFOPTCELLS };
+static int conffoptcells[2][2] = {
+	/* Distro !edited. */	/* Distro edited. */
+	{ cfo_keep,		cfo_install },		/* User !edited. */
+	{ cfo_keep,		cfo_prompt_keep },	/* User edited. */
+};
 
 static void md5hash(struct pkginfo *pkg, char **hashbuf, const char *fn);
 static void copyfileperm(const char* source, const char* target);