fixed #include paths to use local copies of png/gdk_imlib/zlib headers

fixed compiler warning in time.cpp


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@117 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/common/time.cpp

@@ -99,7 +99,7 @@ wxTime::wxTime()
 	 wxTimeInitialized = TRUE;
   }
   sec = wxGetCurrentTime();
-  sec += 2177452800L;     /* seconds from 1/1/01 to 1/1/70 */
+  sec += 2177452800UL;     /* seconds from 1/1/01 to 1/1/70 */
 }
 
 wxTime::wxTime(hourTy h, minuteTy m, secondTy s, bool dst)

src/gdk_imlib/cache.c

@@ -1,6 +1,6 @@
 #define _GNU_SOURCE
-#include "gdk_imlib.h"
+#include "../gdk_imlib/gdk_imlib.h"
-#include "gdk_imlib_private.h"
+#include "../gdk_imlib/gdk_imlib_private.h"
 
 /* uncomment this to compile imlib's cahce with pixmap accounting output */
 /*#define PIXMAP_ACCOUNTING */

src/gdk_imlib/colors.c

@@ -1,6 +1,6 @@
 #define _GNU_SOURCE
-#include "gdk_imlib.h"
+#include "../gdk_imlib/gdk_imlib.h"
-#include "gdk_imlib_private.h"
+#include "../gdk_imlib/gdk_imlib_private.h"
 
 void
 g_PaletteAlloc(int num, int *cols)

src/gdk_imlib/gdk_imlib.h

@@ -2,7 +2,9 @@
 #ifndef __GDK_IMLIB_H__
 #define __GDK_IMLIB_H__
 
-#include <gdk_imlib_types.h>
+// we need this funny include path, because the working directory when
+// including this might actually be ../gdk/ instead of .
+#include "../gdk_imlib/gdk_imlib_types.h"
 
 #ifdef __cplusplus
 extern              "C"

src/gdk_imlib/globals.c

@@ -1,6 +1,6 @@
 
 #define _GNU_SOURCE
-#include "gdk_imlib.h"
+#include "../gdk_imlib/gdk_imlib.h"
-#include "gdk_imlib_private.h"
+#include "../gdk_imlib/gdk_imlib_private.h"
 
 ImlibData          *id;

src/gdk_imlib/load.c

@@ -1,9 +1,9 @@
 
 #define _GNU_SOURCE
-#include <config.h>
+#include "../gdk_imlib/config.h"
 
-#include "gdk_imlib.h"
+#include "../gdk_imlib/gdk_imlib.h"
-#include "gdk_imlib_private.h"
+#include "../gdk_imlib/gdk_imlib_private.h"
 
 /*      Split the ID - damages input    */
 

src/gdk_imlib/misc.c

@@ -1,6 +1,6 @@
 #define _GNU_SOURCE
-#include "gdk_imlib.h"
+#include "../gdk_imlib/gdk_imlib.h"
-#include "gdk_imlib_private.h"
+#include "../gdk_imlib/gdk_imlib_private.h"
 
 gint
 gdk_imlib_get_render_type()

src/gdk_imlib/rend.c

@@ -1,6 +1,6 @@
 #define _GNU_SOURCE
-#include "gdk_imlib.h"
+#include "../gdk_imlib/gdk_imlib.h"
-#include "gdk_imlib_private.h"
+#include "../gdk_imlib/gdk_imlib_private.h"
 
 GdkPixmap          *
 gdk_imlib_pixmap_foreign_new(gint width, gint height,

src/gdk_imlib/save.c

@@ -1,8 +1,8 @@
 #define _GNU_SOURCE
-#include <config.h>
+#include "../gdk_imlib/config.h"
 
-#include "gdk_imlib.h"
+#include "../gdk_imlib/gdk_imlib.h"
-#include "gdk_imlib_private.h"
+#include "../gdk_imlib/gdk_imlib_private.h"
 
 gint
 gdk_imlib_save_image(GdkImlibImage * im, char *file, GdkImlibSaveInfo * info)

src/gdk_imlib/utils.c

@@ -1,7 +1,7 @@
 #define _GNU_SOURCE
 
-#include "gdk_imlib.h"
+#include "../gdk_imlib/gdk_imlib.h"
-#include "gdk_imlib_private.h"
+#include "../gdk_imlib/gdk_imlib_private.h"
 
 void
 gcalc_map_tables(GdkImlibImage * im)

src/gtk/app.cpp

@@ -22,7 +22,7 @@
 #include "unistd.h"
 
 #ifdef USE_GDK_IMLIB
-#include "gdk_imlib.h"
+#include "../gdk_imlib/gdk_imlib.h"
 #endif
 
 //-----------------------------------------------------------------------------

src/gtk/bitmap.cpp

@@ -16,7 +16,7 @@
 #include "gdk/gdkprivate.h"
 
 #ifdef USE_GDK_IMLIB
-#include "gdk_imlib.h"
+#include "../gdk_imlib/gdk_imlib.h"
 #endif
 
 //-----------------------------------------------------------------------------

src/gtk/colour.cpp

@@ -16,7 +16,7 @@
 #include "wx/gdicmn.h"
 
 #ifdef USE_GDK_IMLIB
-#include "gdk_imlib.h"
+#include "../gdk_imlib/gdk_imlib.h"
 #endif
 
 //-----------------------------------------------------------------------------

src/gtk1/app.cpp

@@ -22,7 +22,7 @@
 #include "unistd.h"
 
 #ifdef USE_GDK_IMLIB
-#include "gdk_imlib.h"
+#include "../gdk_imlib/gdk_imlib.h"
 #endif
 
 //-----------------------------------------------------------------------------

src/gtk1/bitmap.cpp

@@ -16,7 +16,7 @@
 #include "gdk/gdkprivate.h"
 
 #ifdef USE_GDK_IMLIB
-#include "gdk_imlib.h"
+#include "../gdk_imlib/gdk_imlib.h"
 #endif
 
 //-----------------------------------------------------------------------------

src/gtk1/colour.cpp

@@ -16,7 +16,7 @@
 #include "wx/gdicmn.h"
 
 #ifdef USE_GDK_IMLIB
-#include "gdk_imlib.h"
+#include "../gdk_imlib/gdk_imlib.h"
 #endif
 
 //-----------------------------------------------------------------------------

src/png/example.c

@@ -13,7 +13,7 @@
  * working PNG reader/writer, see pngtest.c, included in this distribution.
  */
 
-#include "png.h"
+#include "../png/png.h"
 
 /* Check to see if a file is a PNG file using png_sig_cmp().  Returns
  * non-zero if the image is a PNG, and 0 if it isn't a PNG.

src/png/png.c

@@ -11,7 +11,7 @@
 
 #define PNG_INTERNAL
 #define PNG_NO_EXTERN
-#include "png.h"
+#include "../png/png.h"
 
 /* Version information for C files.  This had better match the version
  * string defined in png.h.

src/png/png.h

@@ -106,10 +106,10 @@ extern "C" {
  */
 
 /* include the compression library's header */
-#include "zlib.h"
+#include "../zlib/zlib.h"
 
 /* include all user configurable info */
-#include "pngconf.h"
+#include "../png/pngconf.h"
 
 /* This file is arranged in several sections.  The first section contains
  * structure and type definitions.  The second section contains the external

src/png/pngerror.c

@@ -15,7 +15,7 @@
  */
 
 #define PNG_INTERNAL
-#include "png.h"
+#include "../png/png.h"
 
 static void png_default_error PNGARG((png_structp png_ptr,
                                       png_const_charp message));

src/png/pngget.c

@@ -10,7 +10,7 @@
  */
 
 #define PNG_INTERNAL
-#include "png.h"
+#include "../png/png.h"
 
 png_uint_32
 png_get_valid(png_structp png_ptr, png_infop info_ptr, png_uint_32 flag)

src/png/pngmem.c

@@ -14,7 +14,7 @@
  */
 
 #define PNG_INTERNAL
-#include "png.h"
+#include "../png/png.h"
 
 /* The following "hides" PNG_MALLOC and PNG_FREE thus allowing the pngtest
    application to put a wrapper on top of them. */

src/png/pngpread.c

@@ -10,7 +10,7 @@
  */
 
 #define PNG_INTERNAL
-#include "png.h"
+#include "../png/png.h"
 
 #ifdef PNG_PROGRESSIVE_READ_SUPPORTED
 

src/png/pngread.c

@@ -13,7 +13,7 @@
  */
 
 #define PNG_INTERNAL
-#include "png.h"
+#include "../png/png.h"
 
 /* Create a PNG structure for reading, and allocate any memory needed. */
 png_structp

src/png/pngrio.c

@@ -17,7 +17,7 @@
  */
 
 #define PNG_INTERNAL
-#include "png.h"
+#include "../png/png.h"
 
 /* Read the data from whatever input you are using.  The default routine
    reads from a file pointer.  Note that this routine sometimes gets called

src/png/pngrtran.c

@@ -15,7 +15,7 @@
  */
 
 #define PNG_INTERNAL
-#include "png.h"
+#include "../png/png.h"
 
 #ifdef PNG_READ_COMPOSITE_NODIV_SUPPORTED
 /* With these routines, we avoid an integer divide, which will be slower on

src/png/pngrutil.c

@@ -13,7 +13,7 @@
  */
 
 #define PNG_INTERNAL
-#include "png.h"
+#include "../png/png.h"
 
 #ifndef PNG_READ_BIG_ENDIAN_SUPPORTED
 /* Grab an unsigned 32-bit integer from a buffer in big endian format. */

src/png/pngset.c

@@ -15,7 +15,7 @@
  */
 
 #define PNG_INTERNAL
-#include "png.h"
+#include "../png/png.h"
 
 #if defined(PNG_READ_bKGD_SUPPORTED) || defined(PNG_WRITE_bKGD_SUPPORTED)
 void

src/png/pngtest.c

@@ -35,7 +35,7 @@
 #define PNG_DEBUG 0
 #endif
 
-#include "png.h"
+#include "../png/png.h"
 
 int test_one_file PNGARG((PNG_CONST char *inname, PNG_CONST char *outname));
 

src/png/pngtrans.c

@@ -10,7 +10,7 @@
  */
 
 #define PNG_INTERNAL
-#include "png.h"
+#include "../png/png.h"
 
 #if defined(PNG_READ_BGR_SUPPORTED) || defined(PNG_WRITE_BGR_SUPPORTED)
 /* turn on bgr to rgb mapping */

src/png/pngwio.c

@@ -17,7 +17,7 @@
  */
 
 #define PNG_INTERNAL
-#include "png.h"
+#include "../png/png.h"
 
 /* Write the data to whatever output you are using.  The default routine
    writes to a file pointer.  Note that this routine sometimes gets called

src/png/pngwrite.c

@@ -11,7 +11,7 @@
 
 /* get internal access to png.h */
 #define PNG_INTERNAL
-#include "png.h"
+#include "../png/png.h"
 
 /* Writes all the PNG information.  This is the suggested way to use the
  * library.  If you have a new chunk to add, make a function to write it,

src/png/pngwtran.c

@@ -10,7 +10,7 @@
  */
 
 #define PNG_INTERNAL
-#include "png.h"
+#include "../png/png.h"
 
 /* Transform the data according to the users wishes.  The order of
  * transformations is significant.

src/png/pngwutil.c

@@ -10,7 +10,7 @@
  */
 
 #define PNG_INTERNAL
-#include "png.h"
+#include "../png/png.h"
 
 /* Place a 32-bit number into a buffer in PNG byte order.  We work
  * with unsigned numbers for convenience, although one supported

src/zlib/adler32.c

@@ -5,7 +5,7 @@
 
 /* @(#) $Id$ */
 
-#include "zlib.h"
+#include "../zlib/zlib.h"
 
 #define BASE 65521L /* largest prime smaller than 65536 */
 #define NMAX 5552

src/zlib/compress.c

@@ -5,7 +5,7 @@
 
 /* @(#) $Id$ */
 
-#include "zlib.h"
+#include "../zlib/zlib.h"
 
 /* ===========================================================================
      Compresses the source buffer into the destination buffer. The level

src/zlib/crc32.c

@@ -5,7 +5,7 @@
 
 /* @(#) $Id$ */
 
-#include "zlib.h"
+#include "../zlib/zlib.h"
 
 #define local static
 

src/zlib/example.c

@@ -6,7 +6,7 @@
 /* @(#) $Id$ */
 
 #include <stdio.h>
-#include "zlib.h"
+#include "../zlib/zlib.h"
 
 #ifdef STDC
 #  include <string.h>

src/zlib/minigzip.c

@@ -16,7 +16,7 @@
 /* @(#) $Id$ */
 
 #include <stdio.h>
-#include "zlib.h"
+#include "../zlib/zlib.h"
 
 #ifdef STDC
 #  include <string.h>

src/zlib/uncompr.c

@@ -5,7 +5,7 @@
 
 /* @(#) $Id$ */
 
-#include "zlib.h"
+#include "../zlib/zlib.h"
 
 /* ===========================================================================
      Decompresses the source buffer into the destination buffer.  sourceLen is

src/zlib/zlib.h

@@ -31,7 +31,7 @@
 #ifndef _ZLIB_H
 #define _ZLIB_H
 
-#include "zconf.h"
+#include "../zlib/zconf.h"
 
 #ifdef __cplusplus
 extern "C" {

src/zlib/zutil.h

@@ -13,7 +13,7 @@
 #ifndef _Z_UTIL_H
 #define _Z_UTIL_H
 
-#include "zlib.h"
+#include "../zlib/zlib.h"
 
 #ifdef STDC
 #  include <stddef.h>