Branch: Tag:

2000-07-11

2000-07-11 01:46:03 by Martin Nilsson <mani@lysator.liu.se>

Perhaps more usable macros

Rev: server/etc/include/roxen.h:1.12

1: - // $Id: roxen.h,v 1.11 2000/07/10 17:39:26 nilsson Exp $ + // $Id: roxen.h,v 1.12 2000/07/11 01:46:03 nilsson Exp $   #ifndef _ROXEN_H_      #define _ROXEN_H_
9:   #define perror roxen_perror      // Localization support - #ifndef LOW_LOCALE + #ifndef _DEF_LOCALE   # if constant(Locale.translate) - # define LOW_LOCALE(X,Y) ([string](mixed)Locale.DeferredLocale(GETLOCOBJ,X,Y)) + # define _DEF_LOCALE(X,Y) ([string](mixed)Locale.DeferredLocale(GETLOCOBJ,X,Y))   # else - # define LOW_LOCALE(X,Y) ([string](mixed)RoxenLocale.DeferredLocale(GETLOCOBJ,X,Y)) - # endif // Locale.translate + # define _DEF_LOCALE(X,Y) ([string](mixed)RoxenLocale.DeferredLocale(GETLOCOBJ,X,Y)) + # endif + #endif +  + #ifndef _STR_LOCALE + # if constant(Locale.translate) + # ifdef IN_ROXEN + # define _STR_LOCALE(Z,X,Y) (Locale.translate(locale->get()->Z, X, Y)) + # else + # define _STR_LOCALE(Z,X,Y) (Locale.translate(roxen.locale->get()->Z, X, Y)) + # endif + # else + # ifdef IN_ROXEN + # define _STR_LOCALE(Z,X,Y) (RoxenLocale.translate(locale->get()->Z, X, Y)) + # else + # define _STR_LOCALE(Z,X,Y) (RoxenLocale.translate(roxen.locale->get()->Z, X, Y)) + # endif + # endif + #endif +  + #ifndef LOCALE_PROJECT   # ifdef IN_ROXEN - # define LOCALE_PROJECT(X) static object GETLOCOBJ() {return locale->get()->X;} + # define LOCALE_PROJECT(X) static inline object GETLOCOBJ() {return locale->get()->X;}   # else - # define LOCALE_PROJECT(X) static object GETLOCOBJ() {return roxen.locale->get()->X;} - # endif // IN_ROXEN - #endif // !LOW_LOCALE + # define LOCALE_PROJECT(X) static inline object GETLOCOBJ() {return roxen.locale->get()->X;} + # endif + #endif      #endif /* _ROXEN_H_ */