Update of /cvsroot/libexif/exif/exif
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv29574/exif
Modified Files:
main.c
Log Message:
exif/main.c: Load popt.h later so it works with popt-1.12
Index: main.c
===================================================================
RCS file: /cvsroot/libexif/exif/exif/main.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -d -r1.57 -r1.58
--- main.c 8 Nov 2007 06:30:04 -0000 1.57
+++ main.c 9 Nov 2007 06:54:54 -0000 1.58
@@ -24,7 +24,6 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
-#include <popt.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
@@ -40,6 +39,9 @@
#include "exif-i18n.h"
#include "utils.h"
+/* Must be loaded after exif-i18n.h */
+#include <popt.h>
+
#ifdef HAVE_LOCALE_H
# include <locale.h>
#endif
|
