From 1f0299c17dc878540bf190c290392db241b425ad Mon Sep 17 00:00:00 2001
From: =?utf8?q?Karsten=20Ball=C3=BCder?= <ballueder@usa.net>
Date: Mon, 22 Jun 1998 12:47:56 +0000
Subject: [PATCH] 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       | 2 +-
 src/gdk_imlib/cache.c     | 4 ++--
 src/gdk_imlib/colors.c    | 4 ++--
 src/gdk_imlib/gdk_imlib.h | 4 +++-
 src/gdk_imlib/globals.c   | 4 ++--
 src/gdk_imlib/load.c      | 6 +++---
 src/gdk_imlib/misc.c      | 4 ++--
 src/gdk_imlib/rend.c      | 4 ++--
 src/gdk_imlib/save.c      | 6 +++---
 src/gdk_imlib/utils.c     | 4 ++--
 src/gtk/app.cpp           | 2 +-
 src/gtk/bitmap.cpp        | 2 +-
 src/gtk/colour.cpp        | 2 +-
 src/gtk1/app.cpp          | 2 +-
 src/gtk1/bitmap.cpp       | 2 +-
 src/gtk1/colour.cpp       | 2 +-
 src/png/example.c         | 2 +-
 src/png/png.c             | 2 +-
 src/png/png.h             | 4 ++--
 src/png/pngerror.c        | 2 +-
 src/png/pngget.c          | 2 +-
 src/png/pngmem.c          | 2 +-
 src/png/pngpread.c        | 2 +-
 src/png/pngread.c         | 2 +-
 src/png/pngrio.c          | 2 +-
 src/png/pngrtran.c        | 2 +-
 src/png/pngrutil.c        | 2 +-
 src/png/pngset.c          | 2 +-
 src/png/pngtest.c         | 2 +-
 src/png/pngtrans.c        | 2 +-
 src/png/pngwio.c          | 2 +-
 src/png/pngwrite.c        | 2 +-
 src/png/pngwtran.c        | 2 +-
 src/png/pngwutil.c        | 2 +-
 src/zlib/adler32.c        | 2 +-
 src/zlib/compress.c       | 2 +-
 src/zlib/crc32.c          | 2 +-
 src/zlib/example.c        | 2 +-
 src/zlib/minigzip.c       | 2 +-
 src/zlib/uncompr.c        | 2 +-
 src/zlib/zlib.h           | 2 +-
 src/zlib/zutil.h          | 2 +-
 42 files changed, 55 insertions(+), 53 deletions(-)

diff --git a/src/common/time.cpp b/src/common/time.cpp
index 852de83041..15936ad323 100644
--- a/src/common/time.cpp
+++ b/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)
diff --git a/src/gdk_imlib/cache.c b/src/gdk_imlib/cache.c
index 4e750df20c..561097404d 100644
--- a/src/gdk_imlib/cache.c
+++ b/src/gdk_imlib/cache.c
@@ -1,6 +1,6 @@
 #define _GNU_SOURCE
-#include "gdk_imlib.h"
-#include "gdk_imlib_private.h"
+#include "../gdk_imlib/gdk_imlib.h"
+#include "../gdk_imlib/gdk_imlib_private.h"
 
 /* uncomment this to compile imlib's cahce with pixmap accounting output */
 /*#define PIXMAP_ACCOUNTING */
diff --git a/src/gdk_imlib/colors.c b/src/gdk_imlib/colors.c
index b27207c600..768440dc8f 100644
--- a/src/gdk_imlib/colors.c
+++ b/src/gdk_imlib/colors.c
@@ -1,6 +1,6 @@
 #define _GNU_SOURCE
-#include "gdk_imlib.h"
-#include "gdk_imlib_private.h"
+#include "../gdk_imlib/gdk_imlib.h"
+#include "../gdk_imlib/gdk_imlib_private.h"
 
 void
 g_PaletteAlloc(int num, int *cols)
diff --git a/src/gdk_imlib/gdk_imlib.h b/src/gdk_imlib/gdk_imlib.h
index 5af1cd580e..f8baeaa291 100644
--- a/src/gdk_imlib/gdk_imlib.h
+++ b/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"
diff --git a/src/gdk_imlib/globals.c b/src/gdk_imlib/globals.c
index d92b993247..ab506d6815 100644
--- a/src/gdk_imlib/globals.c
+++ b/src/gdk_imlib/globals.c
@@ -1,6 +1,6 @@
 
 #define _GNU_SOURCE
-#include "gdk_imlib.h"
-#include "gdk_imlib_private.h"
+#include "../gdk_imlib/gdk_imlib.h"
+#include "../gdk_imlib/gdk_imlib_private.h"
 
 ImlibData          *id;
diff --git a/src/gdk_imlib/load.c b/src/gdk_imlib/load.c
index e37495f743..6be12ea80a 100644
--- a/src/gdk_imlib/load.c
+++ b/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_private.h"
+#include "../gdk_imlib/gdk_imlib.h"
+#include "../gdk_imlib/gdk_imlib_private.h"
 
 /*      Split the ID - damages input    */
 
diff --git a/src/gdk_imlib/misc.c b/src/gdk_imlib/misc.c
index e5fe025037..92939bf56c 100644
--- a/src/gdk_imlib/misc.c
+++ b/src/gdk_imlib/misc.c
@@ -1,6 +1,6 @@
 #define _GNU_SOURCE
-#include "gdk_imlib.h"
-#include "gdk_imlib_private.h"
+#include "../gdk_imlib/gdk_imlib.h"
+#include "../gdk_imlib/gdk_imlib_private.h"
 
 gint
 gdk_imlib_get_render_type()
diff --git a/src/gdk_imlib/rend.c b/src/gdk_imlib/rend.c
index 7cdabc01b4..5b77e1f5b1 100644
--- a/src/gdk_imlib/rend.c
+++ b/src/gdk_imlib/rend.c
@@ -1,6 +1,6 @@
 #define _GNU_SOURCE
-#include "gdk_imlib.h"
-#include "gdk_imlib_private.h"
+#include "../gdk_imlib/gdk_imlib.h"
+#include "../gdk_imlib/gdk_imlib_private.h"
 
 GdkPixmap          *
 gdk_imlib_pixmap_foreign_new(gint width, gint height,
diff --git a/src/gdk_imlib/save.c b/src/gdk_imlib/save.c
index 7b16007b4d..5f009b22c7 100644
--- a/src/gdk_imlib/save.c
+++ b/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_private.h"
+#include "../gdk_imlib/gdk_imlib.h"
+#include "../gdk_imlib/gdk_imlib_private.h"
 
 gint
 gdk_imlib_save_image(GdkImlibImage * im, char *file, GdkImlibSaveInfo * info)
diff --git a/src/gdk_imlib/utils.c b/src/gdk_imlib/utils.c
index 961ec908f4..2f0510e7b9 100644
--- a/src/gdk_imlib/utils.c
+++ b/src/gdk_imlib/utils.c
@@ -1,7 +1,7 @@
 #define _GNU_SOURCE
 
-#include "gdk_imlib.h"
-#include "gdk_imlib_private.h"
+#include "../gdk_imlib/gdk_imlib.h"
+#include "../gdk_imlib/gdk_imlib_private.h"
 
 void
 gcalc_map_tables(GdkImlibImage * im)
diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index ee5c02afca..9cfd6f2253 100644
--- a/src/gtk/app.cpp
+++ b/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
 
 //-----------------------------------------------------------------------------
diff --git a/src/gtk/bitmap.cpp b/src/gtk/bitmap.cpp
index 6c2ecbe6d4..845a1fcf00 100644
--- a/src/gtk/bitmap.cpp
+++ b/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
 
 //-----------------------------------------------------------------------------
diff --git a/src/gtk/colour.cpp b/src/gtk/colour.cpp
index ba970a79ba..b0efc2dcc2 100644
--- a/src/gtk/colour.cpp
+++ b/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
 
 //-----------------------------------------------------------------------------
diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp
index ee5c02afca..9cfd6f2253 100644
--- a/src/gtk1/app.cpp
+++ b/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
 
 //-----------------------------------------------------------------------------
diff --git a/src/gtk1/bitmap.cpp b/src/gtk1/bitmap.cpp
index 6c2ecbe6d4..845a1fcf00 100644
--- a/src/gtk1/bitmap.cpp
+++ b/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
 
 //-----------------------------------------------------------------------------
diff --git a/src/gtk1/colour.cpp b/src/gtk1/colour.cpp
index ba970a79ba..b0efc2dcc2 100644
--- a/src/gtk1/colour.cpp
+++ b/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
 
 //-----------------------------------------------------------------------------
diff --git a/src/png/example.c b/src/png/example.c
index bc86aed6ea..4b22852ee2 100644
--- a/src/png/example.c
+++ b/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.
diff --git a/src/png/png.c b/src/png/png.c
index 127b47b68f..33009674d6 100644
--- a/src/png/png.c
+++ b/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.
diff --git a/src/png/png.h b/src/png/png.h
index 36541e916e..3c5ad6007e 100644
--- a/src/png/png.h
+++ b/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
diff --git a/src/png/pngerror.c b/src/png/pngerror.c
index 9bf58a4a5c..c31201bdf4 100644
--- a/src/png/pngerror.c
+++ b/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));
diff --git a/src/png/pngget.c b/src/png/pngget.c
index eb2f64fade..f45fa418aa 100644
--- a/src/png/pngget.c
+++ b/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)
diff --git a/src/png/pngmem.c b/src/png/pngmem.c
index 2fa3627dc4..b92fcc8ae0 100644
--- a/src/png/pngmem.c
+++ b/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. */
diff --git a/src/png/pngpread.c b/src/png/pngpread.c
index 0f0d466fa2..897140d9dc 100644
--- a/src/png/pngpread.c
+++ b/src/png/pngpread.c
@@ -10,7 +10,7 @@
  */
 
 #define PNG_INTERNAL
-#include "png.h"
+#include "../png/png.h"
 
 #ifdef PNG_PROGRESSIVE_READ_SUPPORTED
 
diff --git a/src/png/pngread.c b/src/png/pngread.c
index 1618b73095..714f5f1429 100644
--- a/src/png/pngread.c
+++ b/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
diff --git a/src/png/pngrio.c b/src/png/pngrio.c
index 7adb48f54c..6c6710a46f 100644
--- a/src/png/pngrio.c
+++ b/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
diff --git a/src/png/pngrtran.c b/src/png/pngrtran.c
index 885af53905..684bf5f253 100644
--- a/src/png/pngrtran.c
+++ b/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
diff --git a/src/png/pngrutil.c b/src/png/pngrutil.c
index 1c37906939..e127c87995 100644
--- a/src/png/pngrutil.c
+++ b/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. */
diff --git a/src/png/pngset.c b/src/png/pngset.c
index aa85f24b6f..cb3fbe27b6 100644
--- a/src/png/pngset.c
+++ b/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
diff --git a/src/png/pngtest.c b/src/png/pngtest.c
index 22cbcb3ea2..9eae4795ea 100644
--- a/src/png/pngtest.c
+++ b/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));
 
diff --git a/src/png/pngtrans.c b/src/png/pngtrans.c
index d38dbd19de..b28464acb2 100644
--- a/src/png/pngtrans.c
+++ b/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 */
diff --git a/src/png/pngwio.c b/src/png/pngwio.c
index 444a123b58..6982504691 100644
--- a/src/png/pngwio.c
+++ b/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
diff --git a/src/png/pngwrite.c b/src/png/pngwrite.c
index 9980027e30..699207c04a 100644
--- a/src/png/pngwrite.c
+++ b/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,
diff --git a/src/png/pngwtran.c b/src/png/pngwtran.c
index d85e01536e..df224c88ee 100644
--- a/src/png/pngwtran.c
+++ b/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.
diff --git a/src/png/pngwutil.c b/src/png/pngwutil.c
index 492bde7bb0..c6ae1a677e 100644
--- a/src/png/pngwutil.c
+++ b/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
diff --git a/src/zlib/adler32.c b/src/zlib/adler32.c
index 16cf9a703f..ef4b2ebdc8 100644
--- a/src/zlib/adler32.c
+++ b/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
diff --git a/src/zlib/compress.c b/src/zlib/compress.c
index 1cee470913..51761b105e 100644
--- a/src/zlib/compress.c
+++ b/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
diff --git a/src/zlib/crc32.c b/src/zlib/crc32.c
index a91101a81c..52d9cb1f44 100644
--- a/src/zlib/crc32.c
+++ b/src/zlib/crc32.c
@@ -5,7 +5,7 @@
 
 /* @(#) $Id$ */
 
-#include "zlib.h"
+#include "../zlib/zlib.h"
 
 #define local static
 
diff --git a/src/zlib/example.c b/src/zlib/example.c
index 073ce76b33..a9e6486cc0 100644
--- a/src/zlib/example.c
+++ b/src/zlib/example.c
@@ -6,7 +6,7 @@
 /* @(#) $Id$ */
 
 #include <stdio.h>
-#include "zlib.h"
+#include "../zlib/zlib.h"
 
 #ifdef STDC
 #  include <string.h>
diff --git a/src/zlib/minigzip.c b/src/zlib/minigzip.c
index c05d0ea92f..05d0197caa 100644
--- a/src/zlib/minigzip.c
+++ b/src/zlib/minigzip.c
@@ -16,7 +16,7 @@
 /* @(#) $Id$ */
 
 #include <stdio.h>
-#include "zlib.h"
+#include "../zlib/zlib.h"
 
 #ifdef STDC
 #  include <string.h>
diff --git a/src/zlib/uncompr.c b/src/zlib/uncompr.c
index d103321378..f4d287b518 100644
--- a/src/zlib/uncompr.c
+++ b/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
diff --git a/src/zlib/zlib.h b/src/zlib/zlib.h
index 787b5fd92a..76775e7922 100644
--- a/src/zlib/zlib.h
+++ b/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" {
diff --git a/src/zlib/zutil.h b/src/zlib/zutil.h
index 5e403d1d78..5a832dd7dd 100644
--- a/src/zlib/zutil.h
+++ b/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>
-- 
2.45.2