patches/sed-02-portability.diff
author laca_
Sun, 07 Jan 2007 01:09:46 +0000
changeset 97 b0bce2146b80
permissions -rw-r--r--
2007-01-06 Laszlo (Laca) Peter <[email protected]> * include/usr-gnu.inc: (new) include file for /usr/gnu compliant packages (sets up the directory macros correctly) * SFEcoreutils.spec: update for latest /usr/gnu proposal; add postrun script for updating info dir; use usr-gnu.inc * SFEsed.spec: bump to 4.1.5 and make /usr/gnu compliant * patches/coreutils-01-gettext.diff: merge * patches/sed-01-gettext.diff: (new) update to use glib's gettext macros and utilities * patches/sed-02-portability.diff: (new) fix some gcc'isms
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
97
b0bce2146b80 2007-01-06 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset
     1
--- sed-4.1.5/lib/regcomp.c.patch02	2007-01-06 18:00:39.499812000 -0500
b0bce2146b80 2007-01-06 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset
     2
+++ sed-4.1.5/lib/regcomp.c	2007-01-06 18:01:39.082287000 -0500
b0bce2146b80 2007-01-06 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset
     3
@@ -558,7 +558,7 @@
b0bce2146b80 2007-01-06 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset
     4
 static const bitset_t utf8_sb_map =
b0bce2146b80 2007-01-06 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset
     5
 {
b0bce2146b80 2007-01-06 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset
     6
   /* Set the first 128 bits.  */
b0bce2146b80 2007-01-06 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset
     7
-  [0 ... 0x80 / BITSET_WORD_BITS - 1] = BITSET_WORD_MAX
b0bce2146b80 2007-01-06 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset
     8
+  0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0,
b0bce2146b80 2007-01-06 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset
     9
 };
b0bce2146b80 2007-01-06 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset
    10
 #endif
b0bce2146b80 2007-01-06 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset
    11
 
b0bce2146b80 2007-01-06 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset
    12
--- sed-4.1.5/lib/regexec.c.patch02	2007-01-06 18:10:46.080694000 -0500
b0bce2146b80 2007-01-06 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset
    13
+++ sed-4.1.5/lib/regexec.c	2007-01-06 18:12:58.080470000 -0500
b0bce2146b80 2007-01-06 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset
    14
@@ -2894,7 +2894,7 @@
b0bce2146b80 2007-01-06 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset
    15
 	      sizeof (re_dfastate_t *) * (path->alloc - old_alloc));
b0bce2146b80 2007-01-06 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset
    16
     }
b0bce2146b80 2007-01-06 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset
    17
 
b0bce2146b80 2007-01-06 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset
    18
-  str_idx = path->next_idx ?: top_str;
b0bce2146b80 2007-01-06 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset
    19
+  str_idx = path->next_idx ? path->next_idx : top_str;
b0bce2146b80 2007-01-06 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset
    20
 
b0bce2146b80 2007-01-06 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset
    21
   /* Temporary modify MCTX.  */
b0bce2146b80 2007-01-06 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset
    22
   backup_state_log = mctx->state_log;
b0bce2146b80 2007-01-06 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset
    23
@@ -3286,6 +3288,10 @@
b0bce2146b80 2007-01-06 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset
    24
   return REG_NOERROR;
b0bce2146b80 2007-01-06 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset
    25
 }
b0bce2146b80 2007-01-06 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset
    26
 
b0bce2146b80 2007-01-06 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset
    27
+typedef int bool;
b0bce2146b80 2007-01-06 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset
    28
+#define false 0
b0bce2146b80 2007-01-06 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset
    29
+#define true 1
b0bce2146b80 2007-01-06 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset
    30
+
b0bce2146b80 2007-01-06 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset
    31
 /* Build transition table for the state.
b0bce2146b80 2007-01-06 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset
    32
    Return 1 if succeeded, otherwise return NULL.  */
b0bce2146b80 2007-01-06 Laszlo (Laca) Peter <[email protected]>
laca_
parents:
diff changeset
    33