Update of /cvsroot/libexif/exif/libjpeg
In directory sc8-pr-cvs1:/tmp/cvs-serv807
Modified Files:
jpeg-data.c jpeg-marker.h
Log Message:
Transfer of changes from libexif/libjpeg:
jpeg-marker.h: extern "C" if __cplusplus defined
jpeg-data.c: unistd.h not included; unlink() -> remove()
Index: jpeg-marker.h
===================================================================
RCS file: /cvsroot/libexif/exif/libjpeg/jpeg-marker.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- jpeg-marker.h 15 Dec 2002 11:39:13 -0000 1.2
+++ jpeg-marker.h 7 Jan 2004 15:27:02 -0000 1.3
@@ -20,6 +20,10 @@
#ifndef __JPEG_MARKER_H__
#define __JPEG_MARKER_H__
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
typedef enum _JPEGMarker JPEGMarker;
enum _JPEGMarker {
JPEG_MARKER_SOF0 = 0xc0,
@@ -92,5 +96,9 @@
const char *jpeg_marker_get_name (JPEGMarker marker);
const char *jpeg_marker_get_description (JPEGMarker marker);
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
#endif /* __JPEG_MARKER_H__ */
Index: jpeg-data.c
===================================================================
RCS file: /cvsroot/libexif/exif/libjpeg/jpeg-data.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- jpeg-data.c 28 Sep 2003 18:01:00 -0000 1.8
+++ jpeg-data.c 7 Jan 2004 15:27:02 -0000 1.9
@@ -23,7 +23,6 @@
#include <stdlib.h>
#include <stdio.h>
-#include <unistd.h>
#include <string.h>
/* #define DEBUG */
@@ -81,7 +80,7 @@
if (!d)
return;
- unlink (path);
+ remove (path);
f = fopen (path, "wb");
if (!f) {
free (d);
|
