s/DOMAIN/APT_DOMAIN/, as /usr/include/math.h defines DO...

Author: doogie
Date: 2002-11-11 07:00:16 GMT
s/DOMAIN/APT_DOMAIN/, as /usr/include/math.h defines DOMAIN to 1, and
breaks us.

apt-pkg/init.cc

@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: init.cc,v 1.18 2002/10/16 05:21:33 jgg Exp $
+// $Id: init.cc,v 1.19 2002/11/11 07:00:16 doogie Exp $
 /* ######################################################################
 
    Init - Initialize the package library
@@ -96,7 +96,7 @@ bool pkgInitConfig(Configuration &Cnf)
    
    if (Cnf.Exists("Dir::Locale"))
    {  
-      bindtextdomain(DOMAIN,Cnf.FindDir("Dir::Locale").c_str());
+      bindtextdomain(APT_DOMAIN,Cnf.FindDir("Dir::Locale").c_str());
       bindtextdomain(textdomain(0),Cnf.FindDir("Dir::Locale").c_str());
    }
    

apt-pkg/makefile

@@ -16,7 +16,7 @@ LIBEXT=$(GLIBC_VER)$(LIBSTDCPP_VER)
 MAJOR=3.3
 MINOR=0
 SLIBS=$(PTHREADLIB)
-DOMAIN:=libapt-pkg$(MAJOR)
+APT_DOMAIN:=libapt-pkg$(MAJOR)
 
 # Source code for the contributed non-core things
 SOURCE = contrib/mmap.cc contrib/error.cc contrib/strutl.cc \

buildlib/apti18n.h.in

@@ -1,5 +1,5 @@
 // -*- mode: cpp; mode: fold -*-
-// $Id: apti18n.h.in,v 1.4 2002/10/16 05:24:02 jgg Exp $
+// $Id: apti18n.h.in,v 1.5 2002/11/11 07:00:16 doogie Exp $
 /* Internationalization macros for apt. This header should be included last
    in each C file. */
 
@@ -10,8 +10,8 @@
 #if USE_NLS==yes && USE_INCLUDED_LIBINTL==no
 // apt will use the gettext implementation of the C library
 # include <libintl.h>
-# ifdef DOMAIN
-#   define _(x) dgettext(DOMAIN,x)
+# ifdef APT_DOMAIN
+#   define _(x) dgettext(APT_DOMAIN,x)
 # else
 #   define _(x) gettext(x)
 # endif

buildlib/library.mak

@@ -8,7 +8,7 @@
 # $(LIBRARY) - The name of the library without lib or .so 
 # $(MAJOR) - The major version number of this library
 # $(MINOR) - The minor version number of this library
-# $(DOMAIN) - The text domain for this library
+# $(APT_DOMAIN) - The text domain for this library
 
 # All output is writtin to .opic files in the build directory to
 # signify the PIC output.

buildlib/podomain.mak

@@ -5,9 +5,9 @@
 # CPPFLAG for the compilation.
 
 MY_DOMAIN := $(PACKAGE)
-ifdef DOMAIN
-$($(LOCAL)-OBJS): CPPFLAGS := $(CPPFLAGS) -DDOMAIN='"$(DOMAIN)"'
-MY_DOMAIN := $(DOMAIN)
+ifdef APT_DOMAIN
+$($(LOCAL)-OBJS): CPPFLAGS := $(CPPFLAGS) -DAPT_DOMAIN='"$(APT_DOMAIN)"'
+MY_DOMAIN := $(APT_DOMAIN)
 endif
 
 MKDIRS += $(PO_DOMAINS)/$(MY_DOMAIN)

methods/makefile

@@ -8,7 +8,7 @@ BIN := $(BIN)/methods
 
 # FIXME..
 LIB_APT_PKG_MAJOR = 3.3
-DOMAIN := libapt-pkg$(LIB_APT_PKG_MAJOR)
+APT_DOMAIN := libapt-pkg$(LIB_APT_PKG_MAJOR)
 
 # The file method
 PROGRAM=file