66e07f3a4a
git-svn-id: svn://svn.openwrt.org/openwrt/packages@4891 3c298f89-4303-0410-b956-a3cf2f4a3e73
46 lines
1.6 KiB
Diff
46 lines
1.6 KiB
Diff
--- libgphoto2-2.2.1-old/camlibs/sonix/library.c 2006-04-18 18:54:18.000000000 -0700
|
|
+++ libgphoto2-2.2.1/camlibs/sonix/library.c 2006-07-31 09:02:45.000000000 -0700
|
|
@@ -41,7 +41,7 @@
|
|
#else
|
|
# define _(String) (String)
|
|
# define N_(String) (String)
|
|
-# define ngettext(String1,String2,Count) ((Count==1)?String1:String)
|
|
+# define ngettext(String1,String2,Count) ((Count==1)?String1:String2)
|
|
#endif
|
|
|
|
#include <gphoto2-port.h>
|
|
|
|
--- libgphoto2-2.2.1-old/libgphoto2_port/libgphoto2_port/gphoto2-port-info-list.c 2006-06-03 08:38:12.000000000 -0700
|
|
+++ libgphoto2-2.2.1/libgphoto2_port/libgphoto2_port/gphoto2-port-info-list.c 2006-07-31 09:04:36.000000000 -0700
|
|
@@ -51,6 +51,7 @@
|
|
# define dgettext(Domain,Message) (Message)
|
|
# define dcgettext(Domain,Message,Type) (Message)
|
|
# define bindtextdomain(Domain,Directory) (Domain)
|
|
+# define bind_textdomain_codeset(Domain,Codeset) (Codeset)
|
|
# define _(String) (String)
|
|
# define N_(String) (String)
|
|
#endif
|
|
@@ -79,7 +80,7 @@
|
|
|
|
const char*
|
|
gp_port_message_codeset (const char *codeset) {
|
|
- return bind_textdomain_codeset (GETTEXT_PACKAGE, codeset);
|
|
+ return codeset;
|
|
}
|
|
|
|
/**
|
|
|
|
--- libgphoto2-2.2.1-old/packaging/generic/print-camera-list.c 2006-04-18 18:54:05.000000000 -0700
|
|
+++ libgphoto2-2.2.1/packaging/generic/print-camera-list.c 2006-07-31 09:02:45.000000000 -0700
|
|
@@ -48,8 +48,8 @@
|
|
#include <time.h>
|
|
#include <string.h>
|
|
|
|
-#include <gphoto2/gphoto2-camera.h>
|
|
-#include <gphoto2/gphoto2-port-log.h>
|
|
+#include <libgphoto2/gphoto2-camera.h>
|
|
+#include <libgphoto2_port/gphoto2-port-log.h>
|
|
|
|
#ifndef TRUE
|
|
#define TRUE (0==0)
|